clouddreamai-cicd-setup 1.5.15 → 1.5.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clouddreamai-cicd-setup",
-  "version": "1.5.15",
+  "version": "1.5.17",
   "description": "CloudDreamAI GitLab CI/CD 自动配置工具 - 支持 NestJS/Vue/React 项目的一键 CI/CD 配置",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/templates/gitlab-ci/nestjs-gitlab.yml

@@ -160,8 +160,8 @@ deploy_dev:
   script:
     - sshpass -p "$SSH_PASSWORD" ssh root@$TEST_SERVER_HOST "mkdir -p $DEPLOY_DIR"
     - sshpass -p "$SSH_PASSWORD" ssh root@$TEST_SERVER_HOST "which rsync || apk add --no-cache rsync"
-    # 将环境变量文件写入本地，rsync 会同步到服务器
-    - echo "$ENV_FILE_CONTENT" > .env
+    # 将环境变量文件写入本地，rsync 会同步到服务器（ENV_FILE_CONTENT 是文件路径）
+    - cat "$ENV_FILE_CONTENT" > .env
     - sshpass -p "$SSH_PASSWORD" rsync -avz --delete --exclude='.git/' --exclude='node_modules/' . root@$TEST_SERVER_HOST:$DEPLOY_DIR/
     # 传递 GitLab Registry 凭据和镜像名到部署服务器
     - sshpass -p "$SSH_PASSWORD" ssh root@$TEST_SERVER_HOST "export REGISTRY_URL='$CI_REGISTRY' && export REGISTRY_USERNAME='$CI_REGISTRY_USER' && export REGISTRY_PASSWORD='$CI_REGISTRY_PASSWORD' && export DOCKER_IMAGE='$CI_REGISTRY_IMAGE:latest' && export APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE gitlab"
@@ -193,8 +193,8 @@ deploy_prod:
   script:
     - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "mkdir -p $DEPLOY_DIR"
     - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "which rsync || apk add --no-cache rsync"
-    # 将环境变量文件写入本地，rsync 会同步到服务器
-    - echo "$ENV_FILE_CONTENT" > .env
+    # 将环境变量文件写入本地，rsync 会同步到服务器（ENV_FILE_CONTENT 是文件路径）
+    - cat "$ENV_FILE_CONTENT" > .env
     - sshpass -p "$SSH_PASSWORD" rsync -avz --delete --exclude='.git/' --exclude='node_modules/' . root@$PROD_SERVER_HOST:$DEPLOY_DIR/
     # 传递 GitLab Registry 凭据和镜像名到部署服务器
     - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "export REGISTRY_URL='$CI_REGISTRY' && export REGISTRY_USERNAME='$CI_REGISTRY_USER' && export REGISTRY_PASSWORD='$CI_REGISTRY_PASSWORD' && export DOCKER_IMAGE='$CI_REGISTRY_IMAGE:latest' && export APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE gitlab"

package/templates/gitlab-ci/vue-gitlab.yml

@@ -109,20 +109,52 @@ lint:
     - main
     - develop
 
-# 构建阶段（使用 Docker Socket Binding，复用宿主机 Docker）
-build:
+# 开发环境构建（develop 分支）
+build_dev:
   stage: build
   cache: {}
   image:
     name: docker:24.0.5
     pull_policy: if-not-present
-  # 不使用 DinD 服务，通过 Socket Binding 使用宿主机 Docker
-  # 需要 Runner 配置: volumes = ["/var/run/docker.sock:/var/run/docker.sock"]
+  variables:
+    ENV_FILE_CONTENT: $DEV_ENV_FILE
   before_script:
     - docker info
     - echo "登录到 GitLab Container Registry..."
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
   script:
+    - echo "写入开发环境配置..."
+    - cat "$ENV_FILE_CONTENT" > .env
+    - echo "尝试拉取最新镜像作为缓存..."
+    - docker pull $DOCKER_IMAGE:dev || true
+    - echo "构建Docker镜像..."
+    - |
+      docker build \
+        --cache-from $DOCKER_IMAGE:dev \
+        -t $DOCKER_IMAGE:$CI_COMMIT_SHA \
+        -t $DOCKER_IMAGE:dev .
+    - echo "推送镜像到 GitLab Container Registry..."
+    - docker push $DOCKER_IMAGE:$CI_COMMIT_SHA
+    - docker push $DOCKER_IMAGE:dev
+  only:
+    - develop
+
+# 生产环境构建（main 分支）
+build_prod:
+  stage: build
+  cache: {}
+  image:
+    name: docker:24.0.5
+    pull_policy: if-not-present
+  variables:
+    ENV_FILE_CONTENT: $PROD_ENV_FILE
+  before_script:
+    - docker info
+    - echo "登录到 GitLab Container Registry..."
+    - echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
+  script:
+    - echo "写入生产环境配置..."
+    - cat "$ENV_FILE_CONTENT" > .env
     - echo "尝试拉取最新镜像作为缓存..."
     - docker pull $DOCKER_IMAGE:latest || true
     - echo "构建Docker镜像..."
@@ -136,7 +168,6 @@ build:
     - docker push $DOCKER_IMAGE:latest
   only:
     - main
-    - develop
 
 # 开发环境部署（develop 分支自动触发）
 deploy_dev:
@@ -160,8 +191,8 @@ deploy_dev:
   script:
     - sshpass -p "$SSH_PASSWORD" ssh root@$TEST_SERVER_HOST "mkdir -p $DEPLOY_DIR"
     - sshpass -p "$SSH_PASSWORD" ssh root@$TEST_SERVER_HOST "which rsync || apk add --no-cache rsync"
-    # 将环境变量文件写入本地，rsync 会同步到服务器
-    - echo "$ENV_FILE_CONTENT" > .env
+    # 将环境变量文件写入本地，rsync 会同步到服务器（ENV_FILE_CONTENT 是文件路径）
+    - cat "$ENV_FILE_CONTENT" > .env
     - sshpass -p "$SSH_PASSWORD" rsync -avz --delete --exclude='.git/' --exclude='node_modules/' . root@$TEST_SERVER_HOST:$DEPLOY_DIR/
     # 传递 GitLab Registry 凭据和镜像名到部署服务器
     - sshpass -p "$SSH_PASSWORD" ssh root@$TEST_SERVER_HOST "export REGISTRY_URL='$CI_REGISTRY' && export REGISTRY_USERNAME='$CI_REGISTRY_USER' && export REGISTRY_PASSWORD='$CI_REGISTRY_PASSWORD' && export DOCKER_IMAGE='$CI_REGISTRY_IMAGE:latest' && export APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE gitlab"
@@ -193,8 +224,8 @@ deploy_prod:
   script:
     - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "mkdir -p $DEPLOY_DIR"
     - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "which rsync || apk add --no-cache rsync"
-    # 将环境变量文件写入本地，rsync 会同步到服务器
-    - echo "$ENV_FILE_CONTENT" > .env
+    # 将环境变量文件写入本地，rsync 会同步到服务器（ENV_FILE_CONTENT 是文件路径）
+    - cat "$ENV_FILE_CONTENT" > .env
     - sshpass -p "$SSH_PASSWORD" rsync -avz --delete --exclude='.git/' --exclude='node_modules/' . root@$PROD_SERVER_HOST:$DEPLOY_DIR/
     # 传递 GitLab Registry 凭据和镜像名到部署服务器
     - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "export REGISTRY_URL='$CI_REGISTRY' && export REGISTRY_USERNAME='$CI_REGISTRY_USER' && export REGISTRY_PASSWORD='$CI_REGISTRY_PASSWORD' && export DOCKER_IMAGE='$CI_REGISTRY_IMAGE:latest' && export APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE gitlab"