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

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

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -74,4 +74,4 @@ jobs:
             echo "$GITHUB_CONTEXT"
             cd /home/next-web-app/frontend
             ./bin/clear-docker.sh
-            ./bin/build-container.sh ${{ steps.previoustag.outputs.tag }} hello world
+            ./bin/build-container.sh ${{ steps.previoustag.outputs.tag }}
diff --git a/bin/build-container.sh b/bin/build-container.sh
@@ -2,18 +2,16 @@
 
 set -e
 
-VERSION=$(jq -r '.version' package.json)
-
 echo '全部参数:' $@
-echo 'version:' $0
+echo 'version:' $1
 
 echo '============== docker build contianer ==========='
-echo '构建container的版本号: ' $VERSION
+echo '构建container的版本号: ' $1
 
 docker ps -a | grep 'frontend.' | awk '{print $1}' | xargs docker stop
 docker ps -a | grep 'frontend.' | awk '{print $1}' | xargs docker rm
 docker pull shadowu/wuh.site:latest
-docker container run --name frontend.$VERSION -i -p 3100:3000 --restart=always shadowu/wuh.site:latest
+docker container run --name frontend.v$1 -d -p 3101:3001 --restart=always shadowu/wuh.site:latest
 
 systemctl status docker
 systemctl restart nginx