Merge pull request #55 from stack-wuh/feat-ci

fix: (ci) 测试自动重启容器脚本错误
stack-wuh · Dec 12, 2021 · e1f39d9 · e1f39d9 · vercel · Dec 12, 2021
2 parents da7567e + 9d71f23
commit e1f39d9
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 61 deletions.
diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -11,67 +11,46 @@ on:
     types: [published]
 
 jobs:
-  # push_to_docker:
-  #   name: Push Docker image to Docker Hub
-  #   runs-on: ubuntu-latest
-  #   outputs:
-  #     tags: ${{ steps.release_head_tags.outputs.tags }}
-  #   steps:
-  #     - name: Check out the repo
-  #       uses: actions/checkout@v2
+  push_to_docker:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    outputs:
+      tags: ${{ steps.release_head_tags.outputs.tags }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
 
-  #     - name: Log in to Docker Hub
-  #       uses: docker/login-action@v1
-  #       with:
-  #         username: ${{ secrets.DOCKER_USERNAME }}
-  #         password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-  #     - name: Extract metadata (tags, labels) for Docker
-  #       id: meta
-  #       uses: docker/metadata-action@v3
-  #       with:
-  #         images: shadowu/wuh.site
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: shadowu/wuh.site
 
-  #     - name: Build and push Docker image
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         context: .
-  #         push: true
-  #         tags: ${{ steps.meta.outputs.tags }}
-  #         labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 
-  #     - name: Output
-  #       id: release_head_tags
-  #       run: echo "::set-output name=tags::${{ steps.meta.outputs.tags }}"
+      - name: Output
+        id: release_head_tags
+        run: echo "::set-output name=tags::${{ steps.meta.outputs.tags }}"
 
-  # build_container:
-  #   name: Build Container
-  #   runs-on: ubuntu-latest
-  #   needs: [push_to_docker]
-  #   env:
-  #     TAG_REF: ${{ github.ref }}
-  #     GITHUB_CONTEXT: ${{ toJson(github) }}
-  #   steps:
-  #     - name: executing remote ssh commands using password
-  #       uses: appleboy/ssh-action@master
-  #       with:
-  #         host: ${{ secrets.HOST }}
-  #         username: ${{ secrets.USERNAME }}
-  #         key: ${{ secrets.KEY }}
-  #         port: ${{ secrets.PORT }}
-  #         script: |
-  #           docker ps -a
-  #           tag=`echo ${TAG_REF}|awk -F/ '{print $3}'`
-  #           echo "[github bot] version:" ${tag}
-  #           echo ${TAG_REF}
-  #           echo "$GITHUB_CONTEXT"
-  #           cd /home/next-web-app/frontend
-  #           ./bin/clear-docker.sh
-  #           ./bin/build-container.sh ${tag} hello world
-
-  test_build:
-    name: test build
+  build_container:
+    name: Build Container
     runs-on: ubuntu-latest
+    needs: [push_to_docker]
+    env:
+      TAG_REF: ${{ github.ref }}
+      GITHUB_CONTEXT: ${{ toJson(github) }}
     steps:
       - uses: actions/checkout@v2
         with:
@@ -81,6 +60,18 @@ jobs:
         uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
           fallback: latest
-      - name: logger
-        run: |
-          echo "version.tag:" ${{ steps.previoustag.outputs.tag }}
+      - name: executing remote ssh commands using password
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.KEY }}
+          port: ${{ secrets.PORT }}
+          script: |
+            docker ps -a
+            echo "[github bot] version:" ${{ steps.previoustag.outputs.tag }}
+            echo ${TAG_REF}
+            echo "$GITHUB_CONTEXT"
+            cd /home/next-web-app/frontend
+            ./bin/clear-docker.sh
+            ./bin/build-container.sh ${{ steps.previoustag.outputs.tag }} hello world
diff --git a/bin/build-container.sh b/bin/build-container.sh
@@ -2,12 +2,10 @@
 
 set -e
 
-git reset --hard HEAD~~
-git pull origin main
-
 VERSION=$(jq -r '.version' package.json)
 
 echo '全部参数:' $@
+echo 'version:' $0
 
 echo '============== docker build contianer ==========='
 echo '构建container的版本号: ' $VERSION