修改cicd文件

Author: yqz

.github/workflows/ci.yml

@@ -56,23 +56,30 @@ jobs:
           cp -r vue/dist release/dist
           cp vue/Dockerfile vue/docker.sh vue/nginx.conf release/
 
+      # 在 GitHub Runner 构建镜像并导出，避免国内服务器直连 Docker Hub 拉取 nginx:alpine 超时
+      - name: Build Docker image on runner
+        run: |
+          docker build -t openblog-web release/
+          docker save openblog-web | gzip > release/openblog-web.tar.gz
+
       - name: Deploy files to server
         uses: easingthemes/ssh-deploy@v5.1.1
         with:
           SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
           ARGS: "-rlgoDzvc --delete --exclude=dist/.user.ini"
-          SOURCE: "release/dist release/Dockerfile release/docker.sh release/nginx.conf"
+          SOURCE: "release/dist release/Dockerfile release/docker.sh release/nginx.conf release/openblog-web.tar.gz"
           REMOTE_HOST: ${{ secrets.SERVER_REMOTE_HOST }}
           REMOTE_USER: ${{ secrets.SERVER_REMOTE_USER }}
           TARGET: ${{ secrets.SERVER_TARGET }}
           SCRIPT_BEFORE: ls -la
 
       - name: Run Docker commands on server
-        uses: appleboy/ssh-action@v1
+        uses: appleboy/ssh-action@v1.2.0
         with:
           host: ${{ secrets.SERVER_REMOTE_HOST }}
           username: ${{ secrets.SERVER_REMOTE_USER }}
           key: ${{ secrets.SERVER_SSH_KEY }}
+          command_timeout: 30m
           script: |
             cd ${{ secrets.SERVER_TARGET }}
             sh docker.sh

vue/Dockerfile

@@ -1,4 +1,5 @@
-FROM nginx:alpine
+# CI 会在 GitHub Runner 构建镜像；本地/服务器手动 build 时使用国内可访问的镜像源
+FROM docker.m.daocloud.io/library/nginx:alpine
 COPY dist /usr/share/nginx/html
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

vue/docker.sh

@@ -11,7 +11,14 @@ docker stop "$NAME" 2>/dev/null || true
 docker rm "$NAME" 2>/dev/null || true
 docker rmi "$NAME" 2>/dev/null || true
 
-docker build -t "$NAME" "$DIR"
+IMAGE_TAR="$DIR/openblog-web.tar.gz"
+if [ -f "$IMAGE_TAR" ]; then
+  echo "Loading pre-built image from CI..."
+  gunzip -c "$IMAGE_TAR" | docker load
+else
+  echo "Building image locally (manual deploy)..."
+  docker build -t "$NAME" "$DIR"
+fi
 
 docker run -d \
   -p "${HOST_PORT}:80" \