npm - clouddreamai-cicd-setup - Versions diffs - 1.0.1 → 1.0.3 - Mend

clouddreamai-cicd-setup 1.0.1 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/README.md +421 -92
package/dist/cli.js +5 -2
package/dist/cli.js.map +1 -1
package/dist/core/gitlab-client.d.ts.map +1 -1
package/dist/core/gitlab-client.js +0 -4
package/dist/core/gitlab-client.js.map +1 -1
package/dist/core/types.d.ts +26 -7
package/dist/core/types.d.ts.map +1 -1
package/dist/core/variables.d.ts.map +1 -1
package/dist/core/variables.js +54 -47
package/dist/core/variables.js.map +1 -1
package/dist/utils/prompts.d.ts +8 -8
package/dist/utils/prompts.d.ts.map +1 -1
package/dist/utils/prompts.js +192 -147
package/dist/utils/prompts.js.map +1 -1
package/dist/utils/template.d.ts +13 -5
package/dist/utils/template.d.ts.map +1 -1
package/dist/utils/template.js +77 -12
package/dist/utils/template.js.map +1 -1
package/package.json +1 -1
package/templates/docker-compose/nestjs.yml +17 -0
package/templates/docker-compose/vue.yml +15 -0
package/templates/gitlab-ci/nestjs-gitlab.yml +170 -0
package/templates/gitlab-ci/nestjs.yml +15 -24
package/templates/gitlab-ci/vue-gitlab.yml +168 -0
package/templates/gitlab-ci/vue.yml +15 -24
package/templates/scripts/deploy.sh +121 -15

package/dist/utils/template.js CHANGED Viewed

@@ -52,16 +52,16 @@ class TemplateGenerator {
     /**
      * 生成 .gitlab-ci.yml 文件内容
      */
-    generateGitLabCI(projectType, config, gitlabHost) {
-        // 根据项目类型选择模板
-        const templateName = this.getTemplateNameByType(projectType);
+    generateGitLabCI(projectType, config, gitlabHost, registryType) {
+        // 根据项目类型和 Registry 类型选择模板
+        const templateName = this.getTemplateNameByType(projectType, registryType);
         const templatePath = path.join(this.templatesDir, 'gitlab-ci', `${templateName}.yml`);
         // 读取模板
         const template = fs.readFileSync(templatePath, 'utf-8');
         // 准备替换变量
         const variables = {
             APP_NAME: config.name,
-            DOCKER_IMAGE: config.dockerImage,
+            DOCKER_IMAGE: config.dockerImage || '',
             DEPLOY_DIR: config.deployDir,
             DEV_PORT: config.devPort.toString(),
             PROD_PORT: config.prodPort.toString(),
@@ -69,6 +69,7 @@ class TemplateGenerator {
             PROD_URL: config.prodUrl || `http://localhost:${config.prodPort}`,
             GITLAB_HOST: gitlabHost.replace(/^https?:\/\//, ''),
             LINT_COMMAND: this.getLintCommand(projectType),
+            REGISTRY_TYPE: registryType,
         };
         // 替换占位符
         return this.replacePlaceholders(template, variables);
@@ -84,6 +85,8 @@ class TemplateGenerator {
             DEPLOY_DIR: config.deployDir,
             DEV_PORT: config.devPort.toString(),
             PROD_PORT: config.prodPort.toString(),
+            DEV_DOMAIN: config.devDomain || '',
+            PROD_DOMAIN: config.prodDomain || '',
         };
         return this.replacePlaceholders(template, variables);
     }
@@ -98,10 +101,26 @@ class TemplateGenerator {
         };
         return this.replacePlaceholders(template, variables);
     }
+    /**
+     * 生成 docker-compose.yml 文件内容
+     */
+    generateDockerCompose(projectType, config) {
+        // 根据项目类型选择模板
+        const templateName = this.getDockerComposeTemplate(projectType);
+        const templatePath = path.join(this.templatesDir, 'docker-compose', `${templateName}.yml`);
+        // 读取模板
+        const template = fs.readFileSync(templatePath, 'utf-8');
+        // 准备替换变量
+        const variables = {
+            APP_NAME: config.name,
+            DOCKER_IMAGE: config.dockerImage || config.name,
+        };
+        return this.replacePlaceholders(template, variables);
+    }
     /**
      * 生成所有文件到指定目录
      */
-    generateAll(outputDir, projectType, config, gitlabHost) {
+    async generateAll(outputDir, projectType, config, gitlabHost, registryType) {
         try {
             const files = [];
             // 确保输出目录存在
@@ -114,21 +133,48 @@ class TemplateGenerator {
                 fs.mkdirSync(ciDir, { recursive: true });
             }
             // 生成 .gitlab-ci.yml
-            const gitlabCIContent = this.generateGitLabCI(projectType, config, gitlabHost);
+            const gitlabCIContent = this.generateGitLabCI(projectType, config, gitlabHost, registryType);
             const gitlabCIPath = path.join(outputDir, '.gitlab-ci.yml');
             fs.writeFileSync(gitlabCIPath, gitlabCIContent, 'utf-8');
             files.push(gitlabCIPath);
+            // 生成 docker-compose.yml
+            const dockerComposePath = path.join(outputDir, 'docker-compose.yml');
+            if (fs.existsSync(dockerComposePath)) {
+                // 文件已存在，询问用户是否覆盖
+                const inquirer = (await Promise.resolve().then(() => __importStar(require('inquirer')))).default;
+                const { overwrite } = await inquirer.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'overwrite',
+                        message: '检测到现有 docker-compose.yml，是否覆盖？（覆盖后请检查配置一致性）',
+                        default: false,
+                    },
+                ]);
+                if (overwrite) {
+                    const dockerComposeContent = this.generateDockerCompose(projectType, config);
+                    fs.writeFileSync(dockerComposePath, dockerComposeContent, 'utf-8');
+                    files.push(dockerComposePath);
+                }
+                else {
+                    console.log('⚠️  跳过生成 docker-compose.yml，保留现有文件');
+                }
+            }
+            else {
+                const dockerComposeContent = this.generateDockerCompose(projectType, config);
+                fs.writeFileSync(dockerComposePath, dockerComposeContent, 'utf-8');
+                files.push(dockerComposePath);
+            }
             // 生成 ci/deploy.sh
             const deployScriptContent = this.generateDeployScript(config);
             const deployScriptPath = path.join(ciDir, 'deploy.sh');
-            fs.writeFileSync(deployScriptContent, deployScriptPath, 'utf-8');
+            fs.writeFileSync(deployScriptPath, deployScriptContent, 'utf-8');
             // 添加执行权限
             fs.chmodSync(deployScriptPath, '755');
             files.push(deployScriptPath);
             // 生成 ci/generate-env.sh
             const envScriptContent = this.generateEnvScript(config);
             const envScriptPath = path.join(ciDir, 'generate-env.sh');
-            fs.writeFileSync(envScriptContent, envScriptPath, 'utf-8');
+            fs.writeFileSync(envScriptPath, envScriptContent, 'utf-8');
             // 添加执行权限
             fs.chmodSync(envScriptPath, '755');
             files.push(envScriptPath);
@@ -155,16 +201,35 @@ class TemplateGenerator {
         return result;
     }
     /**
-     * 根据项目类型获取模板名称
+     * 根据项目类型和 Registry 类型获取模板名称
+     */
+    getTemplateNameByType(projectType, registryType) {
+        // 基础模板映射
+        const baseTemplateMapping = {
+            nestjs: 'nestjs',
+            vue: 'vue',
+            react: 'vue', // React 使用和 Vue 相同的模板
+            node: 'nestjs', // 通用 Node.js 项目使用 NestJS 模板
+        };
+        const baseTemplate = baseTemplateMapping[projectType] || 'nestjs';
+        // 如果使用 GitLab Registry，使用专用模板
+        if (registryType === 'gitlab') {
+            return `${baseTemplate}-gitlab`;
+        }
+        // 其他类型（dockerhub, custom, none）使用标准模板
+        return baseTemplate;
+    }
+    /**
+     * 根据项目类型获取 docker-compose 模板名称
      */
-    getTemplateNameByType(projectType) {
-        const mapping = {
+    getDockerComposeTemplate(projectType) {
+        const templateMapping = {
             nestjs: 'nestjs',
             vue: 'vue',
             react: 'vue', // React 使用和 Vue 相同的模板
             node: 'nestjs', // 通用 Node.js 项目使用 NestJS 模板
         };
-        return mapping[projectType] || 'nestjs';
+        return templateMapping[projectType] || 'nestjs';
     }
     /**
      * 根据项目类型获取 lint 命令

package/dist/utils/template.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/utils/template.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~AAqMH~~,0DAEC;~~AArMD~~,uCAAyB;AACzB,2CAA6B;AAG7B;;GAEG;AACH,MAAa,iBAAiB;IAG5B;QACE,sDAAsD;QACtD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC9D,CAAC;IAED;;OAEG;IACH,gBAAgB,CACd,WAAwB,EACxB,MAAqB,EACrB,UAAkB;~~QAElB~~,~~aAAa~~;~~QACb~~,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;~~QAC7D~~,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,IAAI,CAAC,YAAY,EACjB,WAAW,EACX,GAAG,YAAY,MAAM,CACtB,CAAC;QAEF,OAAO;QACP,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAExD,SAAS;QACT,MAAM,SAAS,GAA2B;YACxC,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,YAAY,EAAE,MAAM,CAAC,WAAW;~~YAChC~~,UAAU,EAAE,MAAM,CAAC,SAAS;YAC5B,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YACnC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE;YACrC,OAAO,EAAE,MAAM,CAAC,MAAM,IAAI,oBAAoB,MAAM,CAAC,OAAO,EAAE;YAC9D,QAAQ,EAAE,MAAM,CAAC,OAAO,IAAI,oBAAoB,MAAM,CAAC,QAAQ,EAAE;YACjE,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;YACnD,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC;~~SAC/C~~,CAAC;QAEF,QAAQ;QACR,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,oBAAoB,CAAC,MAAqB;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAExD,MAAM,SAAS,GAA2B;YACxC,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,UAAU,EAAE,MAAM,CAAC,SAAS;YAC5B,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YACnC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE;~~SACtC~~,CAAC;QAEF,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,MAAqB;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,IAAI,CAAC,YAAY,EACjB,SAAS,EACT,iBAAiB,CAClB,CAAC;QACF,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAExD,MAAM,SAAS,GAA2B;YACxC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,WAAW;SAClD,CAAC;QAEF,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,WAAW,~~CACT~~,SAAiB,EACjB,WAAwB,EACxB,MAAqB,EACrB,UAAkB;~~QAElB~~,IAAI,CAAC;YACH,MAAM,KAAK,GAAa,EAAE,CAAC;YAE3B,WAAW;YACX,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/C,CAAC;YAED,YAAY;YACZ,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,CAAC;YAED,oBAAoB;YACpB,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAC3C,WAAW,EACX,MAAM,EACN,UAAU,~~CACX~~,CAAC;YACF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YAC5D,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAEzB,kBAAkB;YAClB,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YACvD,EAAE,CAAC,aAAa,CAAC,~~mBAAmB~~,EAAE,~~gBAAgB~~,EAAE,OAAO,CAAC,CAAC;YACjE,SAAS;YACT,EAAE,CAAC,SAAS,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAE7B,wBAAwB;YACxB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACxD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;YAC1D,EAAE,CAAC,aAAa,CAAC,~~gBAAgB~~,EAAE,~~aAAa~~,EAAE,OAAO,CAAC,CAAC;YAC3D,SAAS;YACT,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAE1B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,WAAW,MAAM,CAAC,KAAK,CAAC,EAAE;aAClC,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,mBAAmB,CACzB,QAAgB,EAChB,SAAiC;QAEjC,IAAI,MAAM,GAAG,QAAQ,CAAC;QAEtB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACrD,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,SAAS,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC1D,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,WAAwB;~~QACpD~~,MAAM,~~OAAO~~,GAAgC;~~YAC3C~~,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,KAAK,EAAE,sBAAsB;YACpC,IAAI,EAAE,QAAQ,EAAE,4BAA4B;SAC7C,CAAC;QAEF,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC;~~IAC1C~~,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,WAAwB;QAC7C,MAAM,QAAQ,GAAgC;YAC5C,MAAM,EAAE,oBAAoB;YAC5B,GAAG,EAAE,oBAAoB;YACzB,KAAK,EAAE,oBAAoB;YAC3B,IAAI,EAAE,cAAc;SACrB,CAAC;QAEF,OAAO,QAAQ,CAAC,WAAW,CAAC,IAAI,cAAc,CAAC;IACjD,CAAC;CACF;~~AAvLD~~,~~8CAuLC~~;AAED;;GAEG;AACH,SAAgB,uBAAuB;IACrC,OAAO,IAAI,iBAAiB,EAAE,CAAC;AACjC,CAAC"}
1	+ {"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/utils/template.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

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

package/templates/docker-compose/nestjs.yml ADDED Viewed

@@ -0,0 +1,17 @@
+version: '3.8'
+services:
+  {{APP_NAME}}:
+    image: {{DOCKER_IMAGE}}:latest
+    container_name: {{APP_NAME}}
+    ports:
+      - "${APP_PORT}:${APP_PORT}"
+    env_file:
+      - .env
+    restart: unless-stopped
+    networks:
+      - app-network
+networks:
+  app-network:
+    driver: bridge

package/templates/docker-compose/vue.yml ADDED Viewed

@@ -0,0 +1,15 @@
+version: '3.8'
+services:
+  {{APP_NAME}}:
+    image: {{DOCKER_IMAGE}}:latest
+    container_name: {{APP_NAME}}
+    ports:
+      - "${APP_PORT}:${APP_PORT}"
+    restart: unless-stopped
+    networks:
+      - app-network
+networks:
+  app-network:
+    driver: bridge

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

@@ -0,0 +1,170 @@
+# GitLab CI/CD 配置文件 - NestJS 项目（GitLab Container Registry）
+stages:
+  - lint
+  - build
+  - deploy
+# 全局变量
+variables:
+  DOCKER_DRIVER: overlay2
+  NODE_VERSION: "20"
+  APP_NAME: "{{APP_NAME}}"
+  GIT_STRATEGY: fetch
+  GIT_SSL_NO_VERIFY: "true"
+  DOCKER_PULL_POLICY: if-not-present
+  # 使用 GitLab Container Registry
+  DOCKER_IMAGE: $CI_REGISTRY_IMAGE
+# 全局缓存配置
+cache:
+  key: ${CI_COMMIT_REF_SLUG}-${CI_JOB_NAME}
+  paths:
+    - node_modules/
+    - .npm/
+# 代码质量检查阶段
+lint:
+  stage: lint
+  image:
+    name: node:20-alpine
+    pull_policy: if-not-present
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}-node-modules
+    paths:
+      - node_modules/
+      - .npm/
+    policy: pull-push
+  before_script:
+    - apk add --no-cache git curl
+    - git --version
+    - echo "Setting up Git authentication..."
+    - git config --global http.sslVerify false
+    - git config --global url."https://oauth2:${GITLAB_ACCESS_TOKEN}@{{GITLAB_HOST}}".insteadOf "http://{{GITLAB_HOST}}"
+    - git config --global url."https://oauth2:${GITLAB_ACCESS_TOKEN}@{{GITLAB_HOST}}".insteadOf "https://{{GITLAB_HOST}}"
+    - npm ci --cache .npm --prefer-offline
+  script:
+    - {{LINT_COMMAND}}
+  only:
+    - merge_requests
+    - main
+    - develop
+# 构建阶段（使用 GitLab Container Registry）
+build:
+  stage: build
+  cache: {}
+  image:
+    name: docker:24.0.5
+    pull_policy: if-not-present
+  before_script:
+    - docker info
+    - echo "登录到 GitLab Container Registry..."
+    # 使用 GitLab CI 预定义变量登录
+    - echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
+  script:
+    - echo "尝试拉取最新镜像作为缓存..."
+    - docker pull $DOCKER_IMAGE:latest || true
+    - echo "构建Docker镜像..."
+    - docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_IMAGE:latest -t $DOCKER_IMAGE:$CI_COMMIT_SHA -t $DOCKER_IMAGE:latest .
+    - echo "推送镜像到 GitLab Container Registry..."
+    - docker push $DOCKER_IMAGE:$CI_COMMIT_SHA
+    - docker push $DOCKER_IMAGE:latest
+  only:
+    - main
+    - develop
+# 开发环境部署（develop 分支自动触发）
+deploy_dev:
+  stage: deploy
+  image:
+    name: alpine:latest
+    pull_policy: if-not-present
+  variables:
+    ENV_TYPE: "development"
+    ENV_FILE_CONTENT: $DEV_ENV_FILE
+    DEPLOY_DIR: "{{DEPLOY_DIR}}"
+    APP_PORT: "{{DEV_PORT}}"
+  cache: {}
+  before_script:
+    - apk add --no-cache sshpass bash openssl rsync
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    # 使用密码认证，跳过 SSH 主机密钥检查
+    - echo "StrictHostKeyChecking no" >> ~/.ssh/config
+    - chmod 600 ~/.ssh/config
+    - echo "StrictHostKeyChecking no" >> ~/.ssh/config
+    - chmod 600 ~/.ssh/config
+  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"
+    - 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 APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE gitlab"
+  environment:
+    name: development
+    url: {{DEV_URL}}
+  only:
+    - develop
+# 生产环境部署（main 分支手动触发）
+deploy_prod:
+  stage: deploy
+  image:
+    name: alpine:latest
+    pull_policy: if-not-present
+  variables:
+    ENV_TYPE: "production"
+    ENV_FILE_CONTENT: $PROD_ENV_FILE
+    DEPLOY_DIR: "{{DEPLOY_DIR}}"
+    APP_PORT: "{{PROD_PORT}}"
+  cache: {}
+  before_script:
+    - apk add --no-cache sshpass bash openssl rsync
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    # 使用密码认证，跳过 SSH 主机密钥检查
+    - echo "StrictHostKeyChecking no" >> ~/.ssh/config
+    - chmod 600 ~/.ssh/config
+    - echo "StrictHostKeyChecking no" >> ~/.ssh/config
+    - chmod 600 ~/.ssh/config
+  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"
+    - 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 APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE gitlab"
+  environment:
+    name: production
+    url: {{PROD_URL}}
+  only:
+    - main
+  when: manual
+# 回滚部署（可选）
+rollback:
+  stage: deploy
+  image:
+    name: alpine:latest
+    pull_policy: if-not-present
+  variables:
+    DEPLOY_DIR: "{{DEPLOY_DIR}}"
+    APP_PORT: "{{PROD_PORT}}"
+  cache: {}
+  before_script:
+    - apk add --no-cache openssh-client openssl
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    # 使用密码认证，跳过 SSH 主机密钥检查
+    - echo "StrictHostKeyChecking no" >> ~/.ssh/config
+    - chmod 600 ~/.ssh/config
+    - chmod 644 ~/.ssh/known_hosts
+  script:
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose down"
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose pull"
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose up -d"
+  environment:
+    name: production
+    url: {{PROD_URL}}
+  when: manual
+  only:
+    - main

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

@@ -83,21 +83,18 @@ deploy_dev:
     ENV_FILE_CONTENT: $DEV_ENV_FILE
     DEPLOY_DIR: "{{DEPLOY_DIR}}"
     APP_PORT: "{{DEV_PORT}}"
+    REGISTRY_TYPE: "{{REGISTRY_TYPE}}"
   cache: {}
   before_script:
-    - apk add --no-cache openssh-client docker-compose bash openssl rsync
-    - eval $(ssh-agent -s)
+    - apk add --no-cache sshpass bash openssl rsync
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - 2>/dev/null || (echo "无法加载SSH密钥，尝试不同格式..." && echo "$SSH_PRIVATE_KEY" | base64 -d | ssh-add - 2>/dev/null || echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa && ssh-add ~/.ssh/id_rsa)
-    - ssh-keyscan $TEST_SERVER_HOST >> ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-    - ssh root@$TEST_SERVER_HOST "mkdir -p $DEPLOY_DIR"
-    - ssh root@$TEST_SERVER_HOST "which rsync || apk add --no-cache rsync"
-    - rsync -avz --delete --exclude='.git/' --exclude='node_modules/' . root@$TEST_SERVER_HOST:$DEPLOY_DIR/
-    - ssh root@$TEST_SERVER_HOST "export DOCKER_HUB_USERNAME='$DOCKER_HUB_USERNAME' && export DOCKER_HUB_PASSWORD='$DOCKER_HUB_PASSWORD' && export APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE"
-    - ssh root@$TEST_SERVER_HOST "sleep 30 && curl -f http://localhost:$APP_PORT/api || exit 1"
+    - 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"
+    - sshpass -p "$SSH_PASSWORD" rsync -avz --delete --exclude='.git/' --exclude='node_modules/' . root@$TEST_SERVER_HOST:$DEPLOY_DIR/
+    - sshpass -p "$SSH_PASSWORD" ssh root@$TEST_SERVER_HOST "export DOCKER_HUB_USERNAME='$DOCKER_HUB_USERNAME' && export DOCKER_HUB_PASSWORD='$DOCKER_HUB_PASSWORD' && export APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE $REGISTRY_TYPE"
   environment:
     name: development
     url: {{DEV_URL}}
@@ -115,21 +112,18 @@ deploy_prod:
     ENV_FILE_CONTENT: $PROD_ENV_FILE
     DEPLOY_DIR: "{{DEPLOY_DIR}}"
     APP_PORT: "{{PROD_PORT}}"
+    REGISTRY_TYPE: "{{REGISTRY_TYPE}}"
   cache: {}
   before_script:
-    - apk add --no-cache openssh-client docker-compose bash openssl rsync
-    - eval $(ssh-agent -s)
+    - apk add --no-cache sshpass bash openssl rsync
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - 2>/dev/null || (echo "无法加载SSH密钥，尝试不同格式..." && echo "$SSH_PRIVATE_KEY" | base64 -d | ssh-add - 2>/dev/null || echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa && ssh-add ~/.ssh/id_rsa)
-    - ssh-keyscan $PROD_SERVER_HOST >> ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-    - ssh root@$PROD_SERVER_HOST "mkdir -p $DEPLOY_DIR"
-    - ssh root@$PROD_SERVER_HOST "which rsync || apk add --no-cache rsync"
-    - rsync -avz --delete --exclude='.git/' --exclude='node_modules/' . root@$PROD_SERVER_HOST:$DEPLOY_DIR/
-    - ssh root@$PROD_SERVER_HOST "export DOCKER_HUB_USERNAME='$DOCKER_HUB_USERNAME' && export DOCKER_HUB_PASSWORD='$DOCKER_HUB_PASSWORD' && export APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE"
-    - ssh root@$PROD_SERVER_HOST "sleep 30 && curl -f http://localhost:$APP_PORT/api || exit 1"
+    - 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"
+    - sshpass -p "$SSH_PASSWORD" rsync -avz --delete --exclude='.git/' --exclude='node_modules/' . root@$PROD_SERVER_HOST:$DEPLOY_DIR/
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "export DOCKER_HUB_USERNAME='$DOCKER_HUB_USERNAME' && export DOCKER_HUB_PASSWORD='$DOCKER_HUB_PASSWORD' && export APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE $REGISTRY_TYPE"
   environment:
     name: production
     url: {{PROD_URL}}
@@ -149,16 +143,13 @@ rollback:
   cache: {}
   before_script:
     - apk add --no-cache openssh-client openssl
-    - eval $(ssh-agent -s)
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - 2>/dev/null || (echo "无法加载SSH密钥，尝试不同格式..." && echo "$SSH_PRIVATE_KEY" | base64 -d | ssh-add - 2>/dev/null || echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa && ssh-add ~/.ssh/id_rsa)
-    - ssh-keyscan $PROD_SERVER_HOST >> ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-    - ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose down"
-    - ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose pull"
-    - ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose up -d"
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose down"
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose pull"
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose up -d"
   environment:
     name: production
     url: {{PROD_URL}}

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

@@ -0,0 +1,168 @@
+# GitLab CI/CD 配置文件 - Vue/React 项目（GitLab Container Registry）
+stages:
+  - lint
+  - build
+  - deploy
+# 全局变量
+variables:
+  DOCKER_DRIVER: overlay2
+  NODE_VERSION: "20"
+  APP_NAME: "{{APP_NAME}}"
+  GIT_STRATEGY: fetch
+  GIT_SSL_NO_VERIFY: "true"
+  DOCKER_PULL_POLICY: if-not-present
+  # 使用 GitLab Container Registry
+  DOCKER_IMAGE: $CI_REGISTRY_IMAGE
+# 全局缓存配置
+cache:
+  key: ${CI_COMMIT_REF_SLUG}-${CI_JOB_NAME}
+  paths:
+    - node_modules/
+    - .npm/
+# 代码质量检查阶段
+lint:
+  stage: lint
+  image:
+    name: node:20-alpine
+    pull_policy: if-not-present
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}-node-modules
+    paths:
+      - node_modules/
+      - .npm/
+    policy: pull-push
+  before_script:
+    - apk add --no-cache git curl
+    - git --version
+    - echo "Setting up Git authentication..."
+    - git config --global http.sslVerify false
+    - git config --global url."https://oauth2:${GITLAB_ACCESS_TOKEN}@{{GITLAB_HOST}}".insteadOf "http://{{GITLAB_HOST}}"
+    - git config --global url."https://oauth2:${GITLAB_ACCESS_TOKEN}@{{GITLAB_HOST}}".insteadOf "https://{{GITLAB_HOST}}"
+    - npm ci --cache .npm --prefer-offline
+  script:
+    - {{LINT_COMMAND}}
+  only:
+    - merge_requests
+    - main
+    - develop
+# 构建阶段（使用 GitLab Container Registry）
+build:
+  stage: build
+  cache: {}
+  image:
+    name: docker:24.0.5
+    pull_policy: if-not-present
+  before_script:
+    - docker info
+    - echo "登录到 GitLab Container Registry..."
+    # 使用 GitLab CI 预定义变量登录
+    - echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
+  script:
+    - echo "尝试拉取最新镜像作为缓存..."
+    - docker pull $DOCKER_IMAGE:latest || true
+    - echo "构建Docker镜像..."
+    - docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_IMAGE:latest -t $DOCKER_IMAGE:$CI_COMMIT_SHA -t $DOCKER_IMAGE:latest .
+    - echo "推送镜像到 GitLab Container Registry..."
+    - docker push $DOCKER_IMAGE:$CI_COMMIT_SHA
+    - docker push $DOCKER_IMAGE:latest
+  only:
+    - main
+    - develop
+# 开发环境部署（develop 分支自动触发）
+deploy_dev:
+  stage: deploy
+  image:
+    name: alpine:latest
+    pull_policy: if-not-present
+  variables:
+    ENV_TYPE: "development"
+    ENV_FILE_CONTENT: $DEV_ENV_FILE
+    DEPLOY_DIR: "{{DEPLOY_DIR}}"
+    APP_PORT: "{{DEV_PORT}}"
+  cache: {}
+  before_script:
+    - apk add --no-cache sshpass bash openssl rsync
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - # 使用密码认证，跳过 SSH 主机密钥检查
+    - echo "StrictHostKeyChecking no" >> ~/.ssh/config
+    - chmod 600 ~/.ssh/config
+    - chmod 644 ~/.ssh/known_hosts
+  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"
+    - 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 APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE gitlab"
+  environment:
+    name: development
+    url: {{DEV_URL}}
+  only:
+    - develop
+# 生产环境部署（main 分支手动触发）
+deploy_prod:
+  stage: deploy
+  image:
+    name: alpine:latest
+    pull_policy: if-not-present
+  variables:
+    ENV_TYPE: "production"
+    ENV_FILE_CONTENT: $PROD_ENV_FILE
+    DEPLOY_DIR: "{{DEPLOY_DIR}}"
+    APP_PORT: "{{PROD_PORT}}"
+  cache: {}
+  before_script:
+    - apk add --no-cache sshpass bash openssl rsync
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - # 使用密码认证，跳过 SSH 主机密钥检查
+    - echo "StrictHostKeyChecking no" >> ~/.ssh/config
+    - chmod 600 ~/.ssh/config
+    - chmod 644 ~/.ssh/known_hosts
+  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"
+    - 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 APP_PORT='$APP_PORT' && cd $DEPLOY_DIR && chmod +x ci/deploy.sh && bash ci/deploy.sh $ENV_TYPE gitlab"
+  environment:
+    name: production
+    url: {{PROD_URL}}
+  only:
+    - main
+  when: manual
+# 回滚部署（可选）
+rollback:
+  stage: deploy
+  image:
+    name: alpine:latest
+    pull_policy: if-not-present
+  variables:
+    DEPLOY_DIR: "{{DEPLOY_DIR}}"
+    APP_PORT: "{{PROD_PORT}}"
+  cache: {}
+  before_script:
+    - apk add --no-cache openssh-client openssl
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - # 使用密码认证，跳过 SSH 主机密钥检查
+    - echo "StrictHostKeyChecking no" >> ~/.ssh/config
+    - chmod 600 ~/.ssh/config
+    - chmod 644 ~/.ssh/known_hosts
+  script:
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose down"
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose pull"
+    - sshpass -p "$SSH_PASSWORD" ssh root@$PROD_SERVER_HOST "cd $DEPLOY_DIR && export APP_PORT=$APP_PORT && docker-compose up -d"
+  environment:
+    name: production
+    url: {{PROD_URL}}
+  when: manual
+  only:
+    - main