From 2299101b328a2b6dc39cbefd81bc1c4b8182f5da Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 11 May 2024 17:39:03 +0800 Subject: [PATCH 1/5] test build --- .github/workflows/dockerToHub-dev.yml | 46 ++++----------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/.github/workflows/dockerToHub-dev.yml b/.github/workflows/dockerToHub-dev.yml index 5e90a0a3d..47ab21862 100644 --- a/.github/workflows/dockerToHub-dev.yml +++ b/.github/workflows/dockerToHub-dev.yml @@ -16,7 +16,7 @@ jobs: with: ref: 'dev' clean: false - github-server-url: 'https://gh.siji.ci' + #github-server-url: 'https://gh.siji.ci' - name: build and deploy to Docker Hub run: | echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin @@ -31,7 +31,7 @@ jobs: yes | docker system prune --filter "until=168h" deploy: name: 部署到dev服务器 - runs-on: self + runs-on: ubuntu-latest needs: build steps: - name: Check out the repo @@ -44,22 +44,23 @@ jobs: uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - name: Sync repository to tx + - name: Sync repository to test server run: | yes | docker image prune - ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.TX_SSH_IP }} 'mkdir -p /data/test/ChatGPT-Next-Web' - rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@tx.xiaosi.cc:/data/test/ChatGPT-Next-Web + ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.UIYJ_SSH_IP }} 'mkdir -p /data/test/ChatGPT-Next-Web' + rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@${{ secrets.UIYJ_SSH_IP }}:/data/test/ChatGPT-Next-Web - name: deploy-to-tx uses: appleboy/ssh-action@master env: SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量 with: - host: ${{ secrets.TX_SSH_IP }} #服务器地址 + host: ${{ secrets.UIYJ_SSH_IP }} #服务器地址 username: root #用户名 port: ${{ secrets.SSH_PORT }} key: ${{ secrets.SSH_PRIVATE_KEY }} #私钥 安全问题一定都以变量的方式传递！！！ envs: SERVER_WORKDIR,ALY_DOCKER_PASSWORD,ALY_DOCKER_USERNAME,DOCKER_ENV #使用工作目录变量 script: | + mkdir -p /data/test/ChatGPT-Next-Web cd /data/test/ChatGPT-Next-Web echo "${{ secrets.DOCKER_ENV }}" > .env # 测试分支, @@ -73,36 +74,3 @@ jobs: yes | docker image prune rm -rf /www/server/nginx/proxy_cache_dir/* || true rm -rf /www/server/nginx/proxy_temp_dir/* || true - - - - name: Sync repository to xy-nm - run: | - yes | docker image prune - ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.NM_SSH_IP }} 'mkdir -p /data/test/ChatGPT-Next-Web' - rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@xy-nm.xiaosi.cc:/data/test/ChatGPT-Next-Web - - name: deploy-to-xy-nm - uses: appleboy/ssh-action@master - env: - SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量 - with: - host: ${{ secrets.NM_SSH_IP }} #服务器地址 - username: root #用户名 - port: ${{ secrets.SSH_PORT }} - key: ${{ secrets.SSH_PRIVATE_KEY }} #私钥 安全问题一定都以变量的方式传递！！！ - envs: SERVER_WORKDIR,ALY_DOCKER_PASSWORD,ALY_DOCKER_USERNAME,DOCKER_ENV #使用工作目录变量 - script: | - cd /data/test/ChatGPT-Next-Web - echo "${{ secrets.DOCKER_ENV }}" > .env - # 测试分支, - echo "COMPOSE_PROJECT_NAME=test-chatgpt-web" >> .env - sed -i 's@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:test@g' docker-compose.yml - echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin - sed -i 's|23000:|23001:|g' docker-compose.yml - sed -i 's|container_name:|#container_name:|g' docker-compose.yml - docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns - docker-compose pull && docker-compose up -d - yes | docker image prune - rm -rf /www/server/nginx/proxy_cache_dir/* || true - rm -rf /www/server/nginx/proxy_temp_dir/* || true - - From 369e63c9226855cde9727bf5961f55bd921fc938 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 11 May 2024 17:40:38 +0800 Subject: [PATCH 2/5] test build --- .github/workflows/dockerToHub-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerToHub-dev.yml b/.github/workflows/dockerToHub-dev.yml index 47ab21862..a5d0d5ea5 100644 --- a/.github/workflows/dockerToHub-dev.yml +++ b/.github/workflows/dockerToHub-dev.yml @@ -1,4 +1,4 @@ -name: DEV DEPLOY TO TX +name: DEV DEPLOY on: workflow_dispatch: # push: From 3e236c25cbd17a9b91059a5589d34fc8bd5ff1d3 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 11 May 2024 17:48:25 +0800 Subject: [PATCH 3/5] test build --- .github/workflows/dockerToHub-dev.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dockerToHub-dev.yml b/.github/workflows/dockerToHub-dev.yml index a5d0d5ea5..ba47d8651 100644 --- a/.github/workflows/dockerToHub-dev.yml +++ b/.github/workflows/dockerToHub-dev.yml @@ -44,6 +44,8 @@ jobs: uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + - name: Install rsync + run: sudo apt-get update && sudo apt-get install -y rsync - name: Sync repository to test server run: | yes | docker image prune From 0a52fadbe32ab6f8d9566311ae2d2e01d2ca6a54 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 11 May 2024 17:55:52 +0800 Subject: [PATCH 4/5] test build --- .github/workflows/dockerToHub-dev.yml | 4 +--- start.sh | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dockerToHub-dev.yml b/.github/workflows/dockerToHub-dev.yml index ba47d8651..5674c89d2 100644 --- a/.github/workflows/dockerToHub-dev.yml +++ b/.github/workflows/dockerToHub-dev.yml @@ -44,11 +44,9 @@ jobs: uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - name: Install rsync - run: sudo apt-get update && sudo apt-get install -y rsync - name: Sync repository to test server run: | - yes | docker image prune + sudo apt-get update && sudo apt-get install -y rsync ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.UIYJ_SSH_IP }} 'mkdir -p /data/test/ChatGPT-Next-Web' rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@${{ secrets.UIYJ_SSH_IP }}:/data/test/ChatGPT-Next-Web - name: deploy-to-tx diff --git a/start.sh b/start.sh index 59f944897..50ea86512 100755 --- a/start.sh +++ b/start.sh @@ -39,8 +39,8 @@ docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns if ! docker buildx inspect mybuilder &> /dev/null; then docker buildx create --use --name=mybuilder fi -#docker build -t registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:temp -f Dockerfile.linux-build . -docker buildx build --platform linux/amd64 -t registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:temp -f Dockerfile.linux-build --load . +#docker buildx build --platform linux/amd64 -t registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:temp -f Dockerfile.linux-build --load . +docker buildx build --platform linux/amd64 -t registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:temp -f Dockerfile --load . docker tag registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:temp registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:latest docker tag registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:temp registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:test From 5b2a9ad3ba2a28713a21c4c413a519c725754e45 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 11 May 2024 17:58:11 +0800 Subject: [PATCH 5/5] test build --- start.sh | 55 ++++++++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/start.sh b/start.sh index 50ea86512..fbc785b90 100755 --- a/start.sh +++ b/start.sh @@ -1,37 +1,30 @@ #!/bin/bash set -e -# 加速 -yarn config set registry 'https://registry.npmmirror.com/' -yarn config set sharp_binary_host "https://npm.taobao.org/mirrors/sharp" -yarn config set sharp_libvips_binary_host "https://npm.taobao.org/mirrors/sharp-libvips" -# 官方 -#yarn config delete registry -#yarn config delete sharp_binary_host -#yarn config delete sharp_libvips_binary_host - -yarn cache clean -yarn install -#if command -v cnpm &> /dev/null -#then -# echo "cnpm 已安装" -#else -# npm i cnpm -#fi +## 加速 +#yarn config set registry 'https://registry.npmmirror.com/' +#yarn config set sharp_binary_host "https://npm.taobao.org/mirrors/sharp" +#yarn config set sharp_libvips_binary_host "https://npm.taobao.org/mirrors/sharp-libvips" +## 官方 +##yarn config delete registry +##yarn config delete sharp_binary_host +##yarn config delete sharp_libvips_binary_host # -#cnpm i -yarn run build - -mkdir -p "./node_modules/tiktoken" -export OUT_DIR="out" - -mkdir -p ${OUT_DIR} - -rsync -az --delete ./.next/standalone/ ${OUT_DIR} -rsync -az --delete ./public/ ${OUT_DIR}/public -rsync -az --delete ./.next/static/ ${OUT_DIR}/.next/static -rsync -az --delete ./.next/server/ ${OUT_DIR}/.next/server -rsync -az --delete ./.next/server/ ${OUT_DIR}/.next/server -rsync -az --delete "./node_modules/tiktoken/" ${OUT_DIR}/node_modules/tiktoken +#yarn cache clean +#yarn install +# +#yarn run build +# +#mkdir -p "./node_modules/tiktoken" +#export OUT_DIR="out" +# +#mkdir -p ${OUT_DIR} +# +#rsync -az --delete ./.next/standalone/ ${OUT_DIR} +#rsync -az --delete ./public/ ${OUT_DIR}/public +#rsync -az --delete ./.next/static/ ${OUT_DIR}/.next/static +#rsync -az --delete ./.next/server/ ${OUT_DIR}/.next/server +#rsync -az --delete ./.next/server/ ${OUT_DIR}/.next/server +#rsync -az --delete "./node_modules/tiktoken/" ${OUT_DIR}/node_modules/tiktoken docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns