diff --git a/Dockerfile/web/apex/aqex_web_Dockerfile b/Dockerfile/web/apex/aqex_web_Dockerfile index 4b7a661..beac07f 100644 --- a/Dockerfile/web/apex/aqex_web_Dockerfile +++ b/Dockerfile/web/apex/aqex_web_Dockerfile @@ -1,12 +1,18 @@ # =============================== # 1) 依赖安装 + 构建阶段 # =============================== -FROM registry.cn-hangzhou.aliyuncs.com/docker_mirror/node:20.15.0-alpine AS build +FROM node:20.15.0-alpine AS build WORKDIR /app +# 安装 pnpm 和 git,前端使用 pnpm 管理依赖,git生成版本信息 +RUN npm install -g pnpm --registry=https://registry.npmmirror.com \ + && echo "https://mirrors.aliyun.com/alpine/v$(cat /etc/alpine-release | cut -d '.' -f 1-2)/main/" > /etc/apk/repositories \ + && echo "https://mirrors.aliyun.com/alpine/v$(cat /etc/alpine-release | cut -d '.' -f 1-2)/community/" >> /etc/apk/repositories \ + && apk add --no-cache git + # 只拷贝 package.json,加快缓存命中 -COPY package.json ./ +COPY package.json pnpm-lock.yaml* ./ # 预先安装依赖(利用缓存) RUN pnpm install --registry=https://registry.npmmirror.com @@ -14,7 +20,7 @@ RUN pnpm install --registry=https://registry.npmmirror.com # 拷贝全部代码 COPY . . -# 要求 package.json 中的 script 形如:build:sit, build:test, build:prod +# package.json内定义了 build 脚本,执行构建 RUN pnpm build RUN mv /app/dist/main/index.html /app/dist/index.html @@ -22,12 +28,13 @@ RUN mv /app/dist/main/index.html /app/dist/index.html # =============================== # 2) 生产镜像阶段 # =============================== -FROM registry.cn-hangzhou.aliyuncs.com/docker_mirror/nginx:1.25-alpine AS runtime +FROM nginx:1.25-alpine AS runtime + +ENV TZ=Asia/Shanghai # 清理默认 nginx 静态内容 RUN rm -rf /usr/share/nginx/html/* -# 拷贝自定义 nginx 配置文件 COPY nginx.conf /etc/nginx/nginx.conf # 拷贝 build 结果 diff --git a/Dockerfile/web/apex/nginx.conf b/Dockerfile/web/apex/nginx.conf index 3e3ba3a..5d2e381 100644 --- a/Dockerfile/web/apex/nginx.conf +++ b/Dockerfile/web/apex/nginx.conf @@ -1,4 +1,7 @@ # nginx.conf +user nginx; +worker_processes auto; + events { worker_connections 1024; } @@ -51,6 +54,7 @@ http { # 静态资源缓存优化 location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ { + root /usr/share/nginx/html; expires 1y; add_header Cache-Control "public, immutable"; access_log off; diff --git a/SCM/部署镜像/apex/DM_apex.groovy b/SCM/部署镜像/apex/DM_apex.groovy new file mode 100644 index 0000000..4ae2051 --- /dev/null +++ b/SCM/部署镜像/apex/DM_apex.groovy @@ -0,0 +1,278 @@ +pipeline { + agent any + + parameters { + imageTag( + name: 'IMAGE_NAME', + description: 'sit 仓库镜像 (除非输入 CUSTOM_IMAGE, 否则使用这里的)', + registry: 'https://uswccr.ccs.tencentyun.com', + image: 'lessiesit/apex', + credentialId: 'dxin_img_hub_auth', + filter: '.*', + defaultTag: '', + tagOrder: 'DSC_VERSION', + verifySsl: true + ) + string( + name: 'CUSTOM_IMAGE', + defaultValue: '', + description: '手输完整镜像//:,例如: uswccr.ccs.tencentyun.com/lessiesit/apex:v0.0.1 (填充后,则忽略镜像仓库选择)' + ) + booleanParam( + name: 'ROLLBACK_VERSION', + defaultValue: false, + description: '是否快速回滚上一个版本?' + ) + choice( + name: 'BRANCH_NAME', + choices: ['dxin', 'opt'], + description: '选择资源清单Yaml的分支' + ) + } + environment { + KUBECONFIG = credentials('k8s-test-config-admin') // k8s 凭证 ID, Jenkins 中配置的凭证名称 + Deployment_yaml = "${WORKSPACE}/lessie-ai/Apex-Evaluation/apex/apex.yaml" + Deployment_name = "apex" + K8s_namespace = "apex-evaluation" + Pod_container_name = "apex" + } + stages { + stage('回滚上版') { + when { expression { return params.ROLLBACK_VERSION == true } } + steps { + script { + sh """ + echo "=== 开始回滚到上一个版本 ===" + kubectl rollout undo deployment/${Deployment_name} -n ${K8s_namespace} + echo "=== 回滚中... ===" + kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=60s + echo "=== 查看所使用的镜像 ===" + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' + echo "=== 回滚完成 ===" + """ + } + } + } + stage('决定镜像') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + def imageRegex = /^([a-zA-Z0-9.-]+)(:[0-9]+)?\/([a-zA-Z0-9._-]+)\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)$/ + + if (params.CUSTOM_IMAGE?.trim()) { + echo "检测手输镜像格式: ${params.CUSTOM_IMAGE}" + def customImage = params.CUSTOM_IMAGE.trim() + // 验证镜像格式 + def matcher = (customImage =~ imageRegex) + if (!matcher.matches()) { + error "CUSTOM_IMAGE 格式不正确,必须是 registry/namespace/repository:tag 格式\n" + + "示例: uswccr.ccs.tencentyun.com/lessiesit/apex:v1.0.0\n" + + "当前输入: ${customImage}" + } + + echo "使用手输镜像: ${customImage}" + env.IMAGE_FULL_NAME = customImage + + } else { + def img = "uswccr.ccs.tencentyun.com/${params.IMAGE_NAME}" + echo "使用 imageTag 插件镜像: ${img}" + env.IMAGE_FULL_NAME = img + } + } + } + } + stage('查询镜像') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + echo "查询镜像: ${IMAGE_FULL_NAME}" + + def result = sh(returnStdout: true, script: """ + /data/sh/get-image-labels-fast.sh \ + "${IMAGE_FULL_NAME}" \ + "100038894437" \ + 'h8H1o6Fd!HLXn' | awk '/^{/,/^}\$/' + """).trim() + + if (result == "" || result == null) { + error("查询镜像 label 失败,请检查镜像是否存在或凭证问题") + } + + echo "镜像 Label:\n${result}" + env.IMAGE_LABEL = result + } + } + } + stage('拉取yaml') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + git branch: "${params.BRANCH_NAME}", + credentialsId: 'fly_gitlab_auth', + url: 'http://172.24.16.20/opt/opt-config.git' + } + } + stage('修改YAML') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + def oldImg = sh ( + script: """ + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' 2>/dev/null || echo "无(可能是首次部署)" + """, + returnStdout: true + ).trim() + env.OLD_IMAGE_NAME = oldImg + echo "--- 目前正常运行的旧镜像: ${OLD_IMAGE_NAME} ---" + echo "--- 所选择新的镜像: ${params.IMAGE_NAME} ---" + echo "--- 修改 Deployment YAML 中的镜像为新镜像版本 ---" + sh """ + sed -i 's#image:.*#image: ${IMAGE_FULL_NAME}#' ${Deployment_yaml} + """ + } + } + } + stage('部署k8s') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + def ANNOTATION = "更新 image 为 ${params.IMAGE_NAME}" + sh """ + echo "===Apply Deployment YAML ===" + kubectl apply -f ${Deployment_yaml} -n ${K8s_namespace} + + echo "=== 查看当前新使用的镜像 ===" + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' + + echo "=== 添加注解 ===" + kubectl annotate deployment/${Deployment_name} kubernetes.io/change-cause="${ANNOTATION}" --overwrite -n ${K8s_namespace} + + echo "=== 查看历史版本 ===" + kubectl rollout history deployment/${Deployment_name} -n ${K8s_namespace} + """ + } + } + } + stage('部署情况') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + echo "=== 检测部署状态并验证新版本运行情况 ===" + echo "--- 检查 Deployment 更新状态 ---" + def rolloutStatus = sh( + script: "kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=60s", + returnStatus: true + ) + + if (rolloutStatus != 0){ + echo "Deployment ${Deployment_name} 发布 **超时或失败**,开始排查..." + sh """ + echo "--- Deployment 状态 ---" + kubectl describe deployment ${Deployment_name} -n ${K8s_namespace} || true + + echo '--- Pod 列表 ---' + kubectl get pods -n ${K8s_namespace} -l "app=${Pod_container_name}" -o wide || true + + echo "--- Pod 描述 (describe) ---" + for pod in \$(kubectl get pods -n ${K8s_namespace} -l "app=${Pod_container_name}" -o jsonpath='{.items[*].metadata.name}'); do + echo "-- Pod 描述 \$pod --" + kubectl describe pod \$pod -n ${K8s_namespace} || true + done + + echo "--- 最近 200 行 Pod 日志 ---" + for pod in \$(kubectl get pods -n ${K8s_namespace} -l "app=${Pod_container_name}" -o jsonpath='{.items[*].metadata.name}'); do + echo "-- logs \$pod --" + kubectl logs \$pod -n ${K8s_namespace} --tail=200 || true + done + """ + error("=== Deployment 发布失败,请检查以上输出定位问题 ===") + } + + echo "=== 检查 Pods 是否全部 Ready ===" + sh "kubectl get pods -l 'app=${Pod_container_name}' -n ${K8s_namespace} -o wide" + + echo "=== 获取最新 Pod 名称 ===" + NEW_POD = sh ( + script: "kubectl get pods -l 'app=${Pod_container_name}' -n ${K8s_namespace} --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}'", + returnStdout: true + ).trim() + + echo "=== 新 Pod 启动日志(最近20行) ===" + sh "kubectl logs ${NEW_POD} -n ${K8s_namespace} --tail=20 || true" + + echo "部署成功:${NEW_POD} 已正常运行" + } + } + } + stage('变更说明') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + def user = currentBuild.getBuildCauses()[0].userName ?: "SYSTEM" + def now = sh(script: "date '+%Y-%m-%d %H:%M:%S'", returnStdout: true).trim() + env.CHANGE_MSG = """ +jenkins执行人: ${user} +修改时间: ${now} +旧镜像: ${OLD_IMAGE_NAME} +新镜像: ${IMAGE_FULL_NAME} +部署对象: ${Deployment_name} +镜像标签: ${env.IMAGE_LABEL} + """.stripIndent().trim() + echo env.CHANGE_MSG + } + } + } + stage('提交变更') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + withCredentials([usernamePassword(credentialsId: 'fly_gitlab_auth', usernameVariable: 'GIT_USER', passwordVariable: 'GIT_PASS')]) { + sh """ + cd ${WORKSPACE} + git config user.name "jenkins" + git config user.email "jenkins@local" + + # 检查工作树是否有变化 + if ! git diff --exit-code ${Deployment_yaml} > /dev/null 2>&1; then + echo "检测到更改,正在提交..." + git add ${Deployment_yaml} + git commit -m "更新镜像 \${CHANGE_MSG}" + else + echo "${Deployment_yaml} 没有变化, 无需commit" + fi + + # 检查是否需要推送(是否有新的提交) + LOCAL=\$(git rev-parse @) + REMOTE=\$(git rev-parse @{u} 2>/dev/null || true) + BASE=\$(git merge-base @ @{u} 2>/dev/null || true) + + if [ "\$LOCAL" = "\$REMOTE" ]; then + echo "已与远程系统同步更新" + elif [ "\$LOCAL" = "\$BASE" ]; then + echo "需要从远程获取数据" + git pull http://172.24.16.20/opt/opt-config.git ${params.BRANCH_NAME} + elif [ "\$REMOTE" = "\$BASE" ]; then + echo "将更改推送到远程服务器..." + # 生成临时 .netrc 文件 + echo "machine 172.24.16.20 login \$GIT_USER password \$GIT_PASS" > ~/.netrc + chmod 600 ~/.netrc + git push http://172.24.16.20/opt/opt-config.git ${params.BRANCH_NAME} + else + echo "与远程模式不同,跳过推送操作" + fi + """ + } + } + } + } + } + + post { + success { + echo "成功!" + echo "=== 所选择镜像: ${params.IMAGE_NAME} ===" + } + failure { + echo "有步骤失败,请检查!" + } + } +} \ No newline at end of file diff --git a/SCM/部署镜像/apex/DM_apex_web.groovy b/SCM/部署镜像/apex/DM_apex_web.groovy new file mode 100644 index 0000000..1eccc74 --- /dev/null +++ b/SCM/部署镜像/apex/DM_apex_web.groovy @@ -0,0 +1,278 @@ +pipeline { + agent any + + parameters { + imageTag( + name: 'IMAGE_NAME', + description: 'sit 仓库镜像 (除非输入 CUSTOM_IMAGE, 否则使用这里的)', + registry: 'https://uswccr.ccs.tencentyun.com', + image: 'lessiesit/apex-web', + credentialId: 'dxin_img_hub_auth', + filter: '.*', + defaultTag: '', + tagOrder: 'DSC_VERSION', + verifySsl: true + ) + string( + name: 'CUSTOM_IMAGE', + defaultValue: '', + description: '手输完整镜像//:,例如: uswccr.ccs.tencentyun.com/lessiesit/apex-web:v0.0.1 (填充后,则忽略镜像仓库选择)' + ) + booleanParam( + name: 'ROLLBACK_VERSION', + defaultValue: false, + description: '是否快速回滚上一个版本?' + ) + choice( + name: 'BRANCH_NAME', + choices: ['dxin', 'opt'], + description: '选择资源清单Yaml的分支' + ) + } + environment { + KUBECONFIG = credentials('k8s-test-config-admin') // k8s 凭证 ID, Jenkins 中配置的凭证名称 + Deployment_yaml = "${WORKSPACE}/lessie-ai/Apex-Evaluation/apex/apex-web.yaml" + Deployment_name = "apex-web" + K8s_namespace = "apex-evaluation" + Pod_container_name = "apex-web" + } + stages { + stage('回滚上版') { + when { expression { return params.ROLLBACK_VERSION == true } } + steps { + script { + sh """ + echo "=== 开始回滚到上一个版本 ===" + kubectl rollout undo deployment/${Deployment_name} -n ${K8s_namespace} + echo "=== 回滚中... ===" + kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=60s + echo "=== 查看所使用的镜像 ===" + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' + echo "=== 回滚完成 ===" + """ + } + } + } + stage('决定镜像') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + def imageRegex = /^([a-zA-Z0-9.-]+)(:[0-9]+)?\/([a-zA-Z0-9._-]+)\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]+)$/ + + if (params.CUSTOM_IMAGE?.trim()) { + echo "检测手输镜像格式: ${params.CUSTOM_IMAGE}" + def customImage = params.CUSTOM_IMAGE.trim() + // 验证镜像格式 + def matcher = (customImage =~ imageRegex) + if (!matcher.matches()) { + error "CUSTOM_IMAGE 格式不正确,必须是 registry/namespace/repository:tag 格式\n" + + "示例: uswccr.ccs.tencentyun.com/lessiesit/apex-web:v1.0.0\n" + + "当前输入: ${customImage}" + } + + echo "使用手输镜像: ${customImage}" + env.IMAGE_FULL_NAME = customImage + + } else { + def img = "uswccr.ccs.tencentyun.com/${params.IMAGE_NAME}" + echo "使用 imageTag 插件镜像: ${img}" + env.IMAGE_FULL_NAME = img + } + } + } + } + stage('查询镜像') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + echo "查询镜像: ${IMAGE_FULL_NAME}" + + def result = sh(returnStdout: true, script: """ + /data/sh/get-image-labels-fast.sh \ + "${IMAGE_FULL_NAME}" \ + "100038894437" \ + 'h8H1o6Fd!HLXn' | awk '/^{/,/^}\$/' + """).trim() + + if (result == "" || result == null) { + error("查询镜像 label 失败,请检查镜像是否存在或凭证问题") + } + + echo "镜像 Label:\n${result}" + env.IMAGE_LABEL = result + } + } + } + stage('拉取yaml') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + git branch: "${params.BRANCH_NAME}", + credentialsId: 'fly_gitlab_auth', + url: 'http://172.24.16.20/opt/opt-config.git' + } + } + stage('修改YAML') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + def oldImg = sh ( + script: """ + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' 2>/dev/null || echo "无(可能是首次部署)" + """, + returnStdout: true + ).trim() + env.OLD_IMAGE_NAME = oldImg + echo "--- 目前正常运行的旧镜像: ${OLD_IMAGE_NAME} ---" + echo "--- 所选择新的镜像: ${params.IMAGE_NAME} ---" + echo "--- 修改 Deployment YAML 中的镜像为新镜像版本 ---" + sh """ + sed -i 's#image:.*#image: ${IMAGE_FULL_NAME}#' ${Deployment_yaml} + """ + } + } + } + stage('部署k8s') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + def ANNOTATION = "更新 image 为 ${params.IMAGE_NAME}" + sh """ + echo "===Apply Deployment YAML ===" + kubectl apply -f ${Deployment_yaml} -n ${K8s_namespace} + + echo "=== 查看当前新使用的镜像 ===" + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' + + echo "=== 添加注解 ===" + kubectl annotate deployment/${Deployment_name} kubernetes.io/change-cause="${ANNOTATION}" --overwrite -n ${K8s_namespace} + + echo "=== 查看历史版本 ===" + kubectl rollout history deployment/${Deployment_name} -n ${K8s_namespace} + """ + } + } + } + stage('部署情况') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + echo "=== 检测部署状态并验证新版本运行情况 ===" + echo "--- 检查 Deployment 更新状态 ---" + def rolloutStatus = sh( + script: "kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=60s", + returnStatus: true + ) + + if (rolloutStatus != 0){ + echo "Deployment ${Deployment_name} 发布 **超时或失败**,开始排查..." + sh """ + echo "--- Deployment 状态 ---" + kubectl describe deployment ${Deployment_name} -n ${K8s_namespace} || true + + echo '--- Pod 列表 ---' + kubectl get pods -n ${K8s_namespace} -l "app=${Pod_container_name}" -o wide || true + + echo "--- Pod 描述 (describe) ---" + for pod in \$(kubectl get pods -n ${K8s_namespace} -l "app=${Pod_container_name}" -o jsonpath='{.items[*].metadata.name}'); do + echo "-- Pod 描述 \$pod --" + kubectl describe pod \$pod -n ${K8s_namespace} || true + done + + echo "--- 最近 200 行 Pod 日志 ---" + for pod in \$(kubectl get pods -n ${K8s_namespace} -l "app=${Pod_container_name}" -o jsonpath='{.items[*].metadata.name}'); do + echo "-- logs \$pod --" + kubectl logs \$pod -n ${K8s_namespace} --tail=200 || true + done + """ + error("=== Deployment 发布失败,请检查以上输出定位问题 ===") + } + + echo "=== 检查 Pods 是否全部 Ready ===" + sh "kubectl get pods -l 'app=${Pod_container_name}' -n ${K8s_namespace} -o wide" + + echo "=== 获取最新 Pod 名称 ===" + NEW_POD = sh ( + script: "kubectl get pods -l 'app=${Pod_container_name}' -n ${K8s_namespace} --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}'", + returnStdout: true + ).trim() + + echo "=== 新 Pod 启动日志(最近20行) ===" + sh "kubectl logs ${NEW_POD} -n ${K8s_namespace} --tail=20 || true" + + echo "部署成功:${NEW_POD} 已正常运行" + } + } + } + stage('变更说明') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + def user = currentBuild.getBuildCauses()[0].userName ?: "SYSTEM" + def now = sh(script: "date '+%Y-%m-%d %H:%M:%S'", returnStdout: true).trim() + env.CHANGE_MSG = """ +jenkins执行人: ${user} +修改时间: ${now} +旧镜像: ${OLD_IMAGE_NAME} +新镜像: ${IMAGE_FULL_NAME} +部署对象: ${Deployment_name} +镜像标签: ${env.IMAGE_LABEL} + """.stripIndent().trim() + echo env.CHANGE_MSG + } + } + } + stage('提交变更') { + when { expression { return params.ROLLBACK_VERSION == false } } + steps { + script { + withCredentials([usernamePassword(credentialsId: 'fly_gitlab_auth', usernameVariable: 'GIT_USER', passwordVariable: 'GIT_PASS')]) { + sh """ + cd ${WORKSPACE} + git config user.name "jenkins" + git config user.email "jenkins@local" + + # 检查工作树是否有变化 + if ! git diff --exit-code ${Deployment_yaml} > /dev/null 2>&1; then + echo "检测到更改,正在提交..." + git add ${Deployment_yaml} + git commit -m "更新镜像 \${CHANGE_MSG}" + else + echo "${Deployment_yaml} 没有变化, 无需commit" + fi + + # 检查是否需要推送(是否有新的提交) + LOCAL=\$(git rev-parse @) + REMOTE=\$(git rev-parse @{u} 2>/dev/null || true) + BASE=\$(git merge-base @ @{u} 2>/dev/null || true) + + if [ "\$LOCAL" = "\$REMOTE" ]; then + echo "已与远程系统同步更新" + elif [ "\$LOCAL" = "\$BASE" ]; then + echo "需要从远程获取数据" + git pull http://172.24.16.20/opt/opt-config.git ${params.BRANCH_NAME} + elif [ "\$REMOTE" = "\$BASE" ]; then + echo "将更改推送到远程服务器..." + # 生成临时 .netrc 文件 + echo "machine 172.24.16.20 login \$GIT_USER password \$GIT_PASS" > ~/.netrc + chmod 600 ~/.netrc + git push http://172.24.16.20/opt/opt-config.git ${params.BRANCH_NAME} + else + echo "与远程模式不同,跳过推送操作" + fi + """ + } + } + } + } + } + + post { + success { + echo "成功!" + echo "=== 所选择镜像: ${params.IMAGE_NAME} ===" + } + failure { + echo "有步骤失败,请检查!" + } + } +} \ No newline at end of file diff --git a/SCM/部署镜像/s1/DM_s1_flymoon_admin.groovy b/SCM/部署镜像/s1/DM_s1_flymoon_admin.groovy index 1dddb06..c3288d0 100644 --- a/SCM/部署镜像/s1/DM_s1_flymoon_admin.groovy +++ b/SCM/部署镜像/s1/DM_s1_flymoon_admin.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s1/DM_s1_flymoon_admin_web.groovy b/SCM/部署镜像/s1/DM_s1_flymoon_admin_web.groovy index 29d46e7..8686cbd 100644 --- a/SCM/部署镜像/s1/DM_s1_flymoon_admin_web.groovy +++ b/SCM/部署镜像/s1/DM_s1_flymoon_admin_web.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s1/DM_s1_flymoon_agent.groovy b/SCM/部署镜像/s1/DM_s1_flymoon_agent.groovy index 15ec402..affe724 100644 --- a/SCM/部署镜像/s1/DM_s1_flymoon_agent.groovy +++ b/SCM/部署镜像/s1/DM_s1_flymoon_agent.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s1/DM_s1_flymoon_email.groovy b/SCM/部署镜像/s1/DM_s1_flymoon_email.groovy index 084c6a0..d04f173 100644 --- a/SCM/部署镜像/s1/DM_s1_flymoon_email.groovy +++ b/SCM/部署镜像/s1/DM_s1_flymoon_email.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s1/DM_s1_flymoon_payment.groovy b/SCM/部署镜像/s1/DM_s1_flymoon_payment.groovy index 54077d9..dedfa6e 100644 --- a/SCM/部署镜像/s1/DM_s1_flymoon_payment.groovy +++ b/SCM/部署镜像/s1/DM_s1_flymoon_payment.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s1/DM_s1_lessie_agent.groovy b/SCM/部署镜像/s1/DM_s1_lessie_agent.groovy index 39dd52f..039ac67 100644 --- a/SCM/部署镜像/s1/DM_s1_lessie_agent.groovy +++ b/SCM/部署镜像/s1/DM_s1_lessie_agent.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s1/DM_s1_lessie_ai_web.groovy b/SCM/部署镜像/s1/DM_s1_lessie_ai_web.groovy index 1bfc3d2..b3928e2 100644 --- a/SCM/部署镜像/s1/DM_s1_lessie_ai_web.groovy +++ b/SCM/部署镜像/s1/DM_s1_lessie_ai_web.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s1/DM_s1_lessie_go_api.groovy b/SCM/部署镜像/s1/DM_s1_lessie_go_api.groovy index f0d0bd9..547fa2d 100644 --- a/SCM/部署镜像/s1/DM_s1_lessie_go_api.groovy +++ b/SCM/部署镜像/s1/DM_s1_lessie_go_api.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s2/DM_s2_lessie_agent.groovy b/SCM/部署镜像/s2/DM_s2_lessie_agent.groovy index 509842f..159f97e 100644 --- a/SCM/部署镜像/s2/DM_s2_lessie_agent.groovy +++ b/SCM/部署镜像/s2/DM_s2_lessie_agent.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s2/DM_s2_lessie_ai_web.groovy b/SCM/部署镜像/s2/DM_s2_lessie_ai_web.groovy index 2f7c6bf..4d7cc24 100644 --- a/SCM/部署镜像/s2/DM_s2_lessie_ai_web.groovy +++ b/SCM/部署镜像/s2/DM_s2_lessie_ai_web.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s2/DM_s2_lessie_go_api.groovy b/SCM/部署镜像/s2/DM_s2_lessie_go_api.groovy index 4a902ac..38af4be 100644 --- a/SCM/部署镜像/s2/DM_s2_lessie_go_api.groovy +++ b/SCM/部署镜像/s2/DM_s2_lessie_go_api.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s3/DM_s3_lessie_agent.groovy b/SCM/部署镜像/s3/DM_s3_lessie_agent.groovy index 72c7002..f5a3e31 100644 --- a/SCM/部署镜像/s3/DM_s3_lessie_agent.groovy +++ b/SCM/部署镜像/s3/DM_s3_lessie_agent.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s3/DM_s3_lessie_ai_web.groovy b/SCM/部署镜像/s3/DM_s3_lessie_ai_web.groovy index 0731eec..87102c0 100644 --- a/SCM/部署镜像/s3/DM_s3_lessie_ai_web.groovy +++ b/SCM/部署镜像/s3/DM_s3_lessie_ai_web.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s3/DM_s3_lessie_go_api.groovy b/SCM/部署镜像/s3/DM_s3_lessie_go_api.groovy index 017f4d5..efc738e 100644 --- a/SCM/部署镜像/s3/DM_s3_lessie_go_api.groovy +++ b/SCM/部署镜像/s3/DM_s3_lessie_go_api.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s4/DM_s4_lessie_agent.groovy b/SCM/部署镜像/s4/DM_s4_lessie_agent.groovy index c3a8378..1896273 100644 --- a/SCM/部署镜像/s4/DM_s4_lessie_agent.groovy +++ b/SCM/部署镜像/s4/DM_s4_lessie_agent.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s4/DM_s4_lessie_ai_web.groovy b/SCM/部署镜像/s4/DM_s4_lessie_ai_web.groovy index 2e25261..92cb5a6 100644 --- a/SCM/部署镜像/s4/DM_s4_lessie_ai_web.groovy +++ b/SCM/部署镜像/s4/DM_s4_lessie_ai_web.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s4/DM_s4_lessie_go_api.groovy b/SCM/部署镜像/s4/DM_s4_lessie_go_api.groovy index 4e2b7d8..5e2d6fe 100644 --- a/SCM/部署镜像/s4/DM_s4_lessie_go_api.groovy +++ b/SCM/部署镜像/s4/DM_s4_lessie_go_api.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s5/DM_s5_lessie_agent.groovy b/SCM/部署镜像/s5/DM_s5_lessie_agent.groovy index fb06a5e..96cbea2 100644 --- a/SCM/部署镜像/s5/DM_s5_lessie_agent.groovy +++ b/SCM/部署镜像/s5/DM_s5_lessie_agent.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s5/DM_s5_lessie_ai_web.groovy b/SCM/部署镜像/s5/DM_s5_lessie_ai_web.groovy index fc5ffa2..5f8927c 100644 --- a/SCM/部署镜像/s5/DM_s5_lessie_ai_web.groovy +++ b/SCM/部署镜像/s5/DM_s5_lessie_ai_web.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s5/DM_s5_lessie_go_api.groovy b/SCM/部署镜像/s5/DM_s5_lessie_go_api.groovy index 1c35294..2782083 100644 --- a/SCM/部署镜像/s5/DM_s5_lessie_go_api.groovy +++ b/SCM/部署镜像/s5/DM_s5_lessie_go_api.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s6/DM_s6_lessie_agent.groovy b/SCM/部署镜像/s6/DM_s6_lessie_agent.groovy index f1a7ea2..0887197 100644 --- a/SCM/部署镜像/s6/DM_s6_lessie_agent.groovy +++ b/SCM/部署镜像/s6/DM_s6_lessie_agent.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s6/DM_s6_lessie_ai_web.groovy b/SCM/部署镜像/s6/DM_s6_lessie_ai_web.groovy index 2a5850b..78e34b0 100644 --- a/SCM/部署镜像/s6/DM_s6_lessie_ai_web.groovy +++ b/SCM/部署镜像/s6/DM_s6_lessie_ai_web.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string( diff --git a/SCM/部署镜像/s6/DM_s6_lessie_go_api.groovy b/SCM/部署镜像/s6/DM_s6_lessie_go_api.groovy index 24f62c6..c3fa6c0 100644 --- a/SCM/部署镜像/s6/DM_s6_lessie_go_api.groovy +++ b/SCM/部署镜像/s6/DM_s6_lessie_go_api.groovy @@ -10,6 +10,7 @@ pipeline { credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', + tagOrder: 'DSC_VERSION', verifySsl: true ) string(