@dazhicheng/common 1.0.13 → 1.0.15

package/.gitlab-ci.yml

@@ -1,74 +1,47 @@
 stages:
+  - build
   - MR_TEST
-  - develop
-  - test
-  - sit
+  - deploy
 
 variables:
   DOCKER_BUILDKIT: 1
 
-MR 构建测试:
-  stage: MR_TEST
-  image: docker:20.10.20
-  tags:
-    - MR_TEST
+# 构建锚点 ----------------------------------------------------------------
+.build_template: &build_template
+  stage: build
+  image: node:20-alpine
   script:
-    # 构建镜像（不部署）
-    - docker build --build-arg NODE_ENV=dev --no-cache -t a-fulfillment-mr-test:mr-$CI_MERGE_REQUEST_IID .
-    # 验证镜像构建成功
-    - docker images | grep a-fulfillment-mr-test
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
+    - npm install -g pnpm
+    - pnpm install
+    - pnpm "build:${NODE_ENV}"
+  artifacts:
+    paths:
+      - dist/
+    expire_in: 1 day
 
-开发环境发版:
-  stage: develop
+# 部署锚点（通用脚本直接写在这里，不需要项目覆盖） -------------------------
+.deploy_template: &deploy_template
+  stage: deploy
   image: docker:20.10.20
-  tags:
-    - develop
-  resource_group: deploy-develop # 重点
   script:
-    <<<script_开发环境发版>>>
-    # 清理悬空镜像
+    - docker build --build-arg NODE_ENV=$NODE_ENV -t $IMAGE_NAME:latest .
+    - docker stop $IMAGE_NAME || true
+    - docker rm $IMAGE_NAME || true
+    - docker run -d --name $IMAGE_NAME --restart always -p $HOST_PORT:$CONTAINER_PORT $IMAGE_NAME:latest
     - docker image prune -f || true
-  only:
-    - develop
 
-开发环境发版_107:
-  stage: develop
-  image: docker:20.10.20
-  tags:
-    - develop_107
-  resource_group: deploy-develop_107 # 重点
-  script:
-    <<<script_开发环境发版_107>>>
-    # 清理悬空镜像
-    - docker image prune -f || true
-  only:
-    - develop
-
-# 测试环境 -----------------------------------------------------------------------------------------------
-测试环境发版:
-  stage: test
+# MR 验证 -----------------------------------------------------------------
+MR 构建验证:
+  stage: MR_TEST
   image: docker:20.10.20
   tags:
-    - test
-  resource_group: deploy-test # 重点
+    - MR_TEST
+  needs: [构建_dev]
   script:
-    <<<script_测试环境发版>>>
-    # 清理悬空镜像
-    - docker image prune -f || true
-  only:
-    - test
+    - docker build --build-arg NODE_ENV=dev -t mr-test:mr-$CI_MERGE_REQUEST_IID .
+    - docker images | grep mr-test
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
 
-测试环境发版_107:
-  stage: test
-  image: docker:20.10.20
-  tags:
-    - test_107
-  resource_group: deploy-test_107 # 重点
-  script:
-    <<<script_测试环境发版_107>>>
-    # 清理悬空镜像
-    - docker image prune -f || true
-  only:
-    - test
+# 项目级 deploy jobs 注入点 ------------------------------------------------
+<<<deploy_jobs>>>

package/Dockerfile

@@ -1,36 +1,6 @@
-# 阶段 1：构建前端项目
-FROM node:24-alpine AS builder
-
-WORKDIR /app
-
-# 安装 pnpm 并配置镜像源
-RUN npm install -g pnpm && \
-    pnpm config set registry https://registry.npmmirror.com
-
-ARG NODE_ENV=dev
-
-# 先复制依赖文件并安装依赖
-COPY package*.json pnpm-lock.yaml* pnpm-workspace.yaml ./
-COPY scripts/sync-common.mjs ./scripts/
-RUN pnpm install
-
-
-# 再复制全部源代码，进行构建
-COPY . .
-# 同步生成文件
-RUN pnpm sync:common
-RUN pnpm "build:${NODE_ENV}"
-
-# 阶段 2：部署到 Nginx
-FROM nginx:stable-alpine
-
-ARG NODE_ENV=dev
-
-# 复制 Nginx 配置
-COPY --from=builder /app/nginx_${NODE_ENV}.conf /etc/nginx/conf.d/default.conf
-
-# 复制构建产物
-COPY --from=builder /app/dist /usr/share/nginx/html
-
-# 启动 Nginx
+
+FROM nginx:stable-alpine
+ARG NODE_ENV=dev
+COPY "nginx_${NODE_ENV}.conf" /etc/nginx/conf.d/default.conf
+COPY dist/ /usr/share/nginx/html
 CMD ["nginx", "-g", "daemon off;"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/common",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "共享配置文件",
   "type": "module",
   "types": "./src/types/index.d.ts",