diff --git a/.github/workflows/dockerToHub-dev.yml b/.github/workflows/dockerToHub-dev.yml index bdd9662cf..a9303173a 100644 --- a/.github/workflows/dockerToHub-dev.yml +++ b/.github/workflows/dockerToHub-dev.yml @@ -12,28 +12,28 @@ on: # - 'package.json' jobs: - build: - name: build image to aly - # runs-on: "103.200" - runs-on: thinkpad - # runs-on: ubuntu-latest - # runs-on: self-hosted - steps: - - name: Check out the repo - uses: actions/checkout@v3 - with: - clean: true - ref: 'dev' - - 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 - echo "${{ secrets.DOCKER_ENV }}" > .env - docker-compose build - docker-compose push - yes | docker system prune --filter "until=168h" +# build: +# name: build image to aly +# # runs-on: "103.200" +# runs-on: thinkpad +# # runs-on: ubuntu-latest +# # runs-on: self-hosted +# steps: +# - name: Check out the repo +# uses: actions/checkout@v3 +# with: +# clean: true +# ref: 'dev' +# - 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 +# echo "${{ secrets.DOCKER_ENV }}" > .env +# docker-compose build +# docker-compose push +# yes | docker system prune --filter "until=168h" deploy: name: 部署到dev服务器 - needs: build + needs: z4 runs-on: thinkpad steps: - name: Check out the repo @@ -61,9 +61,10 @@ jobs: 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-compose pull && docker-compose up -d - yes | docker image prune + #echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin + #docker-compose pull && docker-compose up -d + #yes | docker image prune + yarn install && yarn run build rm -rf /www/server/nginx/proxy_cache_dir/* rm -rf /www/server/nginx/proxy_temp_dir/* sleep 2