From a3c4f10713ea1694a32a00b3b4601ae2a2fe6209 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Wed, 17 Jul 2024 13:46:00 +0800 Subject: [PATCH] fix google bug --- .github/workflows/dockerToHub.yml | 90 +++++++++++++++---------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/dockerToHub.yml b/.github/workflows/dockerToHub.yml index 137fb3813..7a9a4930d 100644 --- a/.github/workflows/dockerToHub.yml +++ b/.github/workflows/dockerToHub.yml @@ -34,16 +34,16 @@ jobs: docker-compose build docker-compose push #yes | docker system prune --filter "until=168h" - download-repo: - name: 下载仓库 - needs: build - runs-on: self - steps: - - name: Check out the repo - uses: actions/checkout@v4 - with: - clean: true - github-server-url: 'https://gh.sivpn.cn' +# download-repo: +# name: 下载仓库 +# needs: build +# runs-on: self +# steps: +# - name: Check out the repo +# uses: actions/checkout@v4 +# with: +# clean: true +# github-server-url: 'https://gh.sivpn.cn' # deploy-nm: # name: 部署到内蒙服务器 # needs: download-repo @@ -79,38 +79,38 @@ jobs: # sleep 2 # #tccli cdn PurgePathCache --cli-unfold-argument --Paths '${{ secrets.WEB_URL }}' --FlushType delete - deploy-bk-uiyj: - name: 部署到十堰服务器 - needs: download-repo - runs-on: self - steps: - - name: Set up SSH key - uses: webfactory/ssh-agent@v0.9.0 - with: - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - name: Sync repository to uiyj - run: | - #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/ChatGPT-Next-Web' - /usr/bin/rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@${{ secrets.UIYJ_SSH_IP }}:/data/ChatGPT-Next-Web/ - - name: deploy-to-uiyj - uses: appleboy/ssh-action@master - env: - SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量 - with: - 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: | - cd $SERVER_WORKDIR #进入到工作目录 - echo "${{ secrets.DOCKER_ENV }}" > .env - echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin - 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 - sleep 2 - tccli cdn PurgePathCache --cli-unfold-argument --Paths '${{ secrets.WEB_URL }}' --FlushType delete +# deploy-bk-uiyj: +# name: 部署到十堰服务器 +# needs: download-repo +# runs-on: self +# steps: +# - name: Set up SSH key +# uses: webfactory/ssh-agent@v0.9.0 +# with: +# ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} +# - name: Sync repository to uiyj +# run: | +# #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/ChatGPT-Next-Web' +# /usr/bin/rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@${{ secrets.UIYJ_SSH_IP }}:/data/ChatGPT-Next-Web/ +# - name: deploy-to-uiyj +# uses: appleboy/ssh-action@master +# env: +# SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量 +# with: +# 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: | +# cd $SERVER_WORKDIR #进入到工作目录 +# echo "${{ secrets.DOCKER_ENV }}" > .env +# echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin +# 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 +# sleep 2 +# tccli cdn PurgePathCache --cli-unfold-argument --Paths '${{ secrets.WEB_URL }}' --FlushType delete