From e2e0dfd8ff027f8a6be702d4cec3d4a2082a3b77 Mon Sep 17 00:00:00 2001 From: dxin Date: Wed, 22 Oct 2025 17:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile/go/Dockerfile | 27 +++ Dockerfile/java/admin_Dockerfile | 23 +++ Dockerfile/java/agent_Dockerfile | 25 +++ Dockerfile/java/payment_Dockerfile | 25 +++ .../python/lessie-sourcing-agents/Dockerfile | 71 ++++++++ .../docker-entrypoint.sh | 30 ++++ ...roovy => build_image_flymoon_admin.groovy} | 37 ++-- SCM/build_image_go_lessie_sourcing_api.groovy | 170 ++++++++++++++++++ ...build_image_lessie_sourcing_agents.groovy} | 8 +- .../java}/us_prod_fly_moon_admin.pipeline | 0 .../java}/us_prod_flymoon_agent.pipeline | 0 .../java}/us_prod_flymoon_email.pipeline | 0 .../java}/us_prod_flymoon_payment.pipeline | 0 ...ersea_prod_lessie_sourcing_agents.pipeline | 0 {python => old_pipeline/python}/tmp.groovy | 0 .../us_prod_flymoon_api_monitor.pipeline | 0 16 files changed, 401 insertions(+), 15 deletions(-) create mode 100644 Dockerfile/go/Dockerfile create mode 100644 Dockerfile/java/admin_Dockerfile create mode 100644 Dockerfile/java/agent_Dockerfile create mode 100644 Dockerfile/java/payment_Dockerfile create mode 100644 Dockerfile/python/lessie-sourcing-agents/Dockerfile create mode 100644 Dockerfile/python/lessie-sourcing-agents/docker-entrypoint.sh rename SCM/{build_image_lessie_agents_test.groovy => build_image_flymoon_admin.groovy} (85%) create mode 100644 SCM/build_image_go_lessie_sourcing_api.groovy rename SCM/{build_image_lessie_agents_prod.groovy => build_image_lessie_sourcing_agents.groovy} (96%) rename {java => old_pipeline/java}/us_prod_fly_moon_admin.pipeline (100%) rename {java => old_pipeline/java}/us_prod_flymoon_agent.pipeline (100%) rename {java => old_pipeline/java}/us_prod_flymoon_email.pipeline (100%) rename {java => old_pipeline/java}/us_prod_flymoon_payment.pipeline (100%) rename {python => old_pipeline/python}/oversea_prod_lessie_sourcing_agents.pipeline (100%) rename {python => old_pipeline/python}/tmp.groovy (100%) rename {python => old_pipeline/python}/us_prod_flymoon_api_monitor.pipeline (100%) diff --git a/Dockerfile/go/Dockerfile b/Dockerfile/go/Dockerfile new file mode 100644 index 0000000..cf77163 --- /dev/null +++ b/Dockerfile/go/Dockerfile @@ -0,0 +1,27 @@ +# 基础镜像：轻量Alpine，适配Go二进制运行 +FROM alpine:latest + +# 定义环境变量（默认值：ENV=local，port=8100，容器启动可覆盖） +ENV APP_ENV=local \ + APP_PORT=8100 + +# 安装必要依赖（若Go二进制依赖系统C库，无依赖可删除此步） +RUN apk add --no-cache libc6-compat + +# 创建工作目录（统一存放二进制和配置文件） +WORKDIR /app + +# 1. 复制配置文件到 /app 目录（与二进制文件同目录） +# 本地 configs/ 目录下的所有文件，会直接复制到容器 /app/ 下 +COPY configs/* /app/ + +# 2. 复制Go二进制文件到 /app 目录 +# 本地二进制文件路径替换为实际路径（如 ./s3-lessie-sourcing-api） +COPY build/lessie-sourcing-api /app/ + +# 暴露默认端口（与APP_PORT默认值一致，仅声明作用） +EXPOSE 8100 + +# 启动命令：通过环境变量动态注入ENV和port +# 逻辑：用APP_ENV设置启动ENV，APP_PORT设置--port参数（默认8100） +CMD ["sh", "-c", "env ENV=$APP_ENV /app/lessie-sourcing-api --port ${APP_PORT}"] \ No newline at end of file diff --git a/Dockerfile/java/admin_Dockerfile b/Dockerfile/java/admin_Dockerfile new file mode 100644 index 0000000..a41bcd0 --- /dev/null +++ b/Dockerfile/java/admin_Dockerfile @@ -0,0 +1,23 @@ +# 使用官方 Java 21 精简镜像（含JDK，适合运行Spring Boot等Java应用） +FROM mirror.ccs.tencentyun.com/library/openjdk:21-jdk-slim AS runtime + +# 配置环境变量（解决中文乱码、时区问题） +ENV LANG=C.UTF-8 \ + TZ=Asia/Shanghai \ + JAVA_OPTS="" + +# 创建应用工作目录 +WORKDIR /app + +# 复制主应用JAR 和 API JAR +COPY target/flymoon-admin.jar /app/flymoon-admin.jar + +# 暴露应用端口（根据实际端口修改，如8070、9090等） +EXPOSE 8070 + +# 默认启动环境sit，可被覆盖，外部使用-e or env SPRING_PROFILES_ACTIVE=xxx覆盖 +ARG RUN_PROFILE=sit +ENV SPRING_PROFILES_ACTIVE=${RUN_PROFILE} + +# 启动命令（支持外部传入JVM参数，如 -Xms512m -Xmx1024m） +ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/flymoon-admin.jar --spring.profiles.active=${SPRING_PROFILES_ACTIVE}"] \ No newline at end of file diff --git a/Dockerfile/java/agent_Dockerfile b/Dockerfile/java/agent_Dockerfile new file mode 100644 index 0000000..8b7589e --- /dev/null +++ b/Dockerfile/java/agent_Dockerfile @@ -0,0 +1,25 @@ +# 使用官方 Java 21 精简镜像（含JDK，适合运行Spring Boot等Java应用） +FROM mirror.ccs.tencentyun.com/library/openjdk:21-jdk-slim AS runtime + +# 配置环境变量（解决中文乱码、时区问题） +ENV LANG=C.UTF-8 \ + TZ=Asia/Shanghai \ + JAVA_OPTS="" + +# 创建应用工作目录 +WORKDIR /app + +# 复制主应用JAR 和 API JAR +COPY flymoon-agent-provider/target/flymoon-agent.jar /app/flymoon-agent.jar +COPY flymoon-agent-api/target/flymoon-agent-api.jar /app/flymoon-agent-api.jar + + +# 暴露应用端口（根据实际端口修改，如8070、9090等） +EXPOSE 8070 + +# 默认启动环境sit，可被覆盖，外部使用-e or env SPRING_PROFILES_ACTIVE=xxx覆盖 +ARG RUN_PROFILE=sit +ENV SPRING_PROFILES_ACTIVE=${RUN_PROFILE} + +# 启动命令（支持外部传入JVM参数，如 -Xms512m -Xmx1024m） +ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/flymoon-agent.jar --spring.profiles.active=${SPRING_PROFILES_ACTIVE}"] \ No newline at end of file diff --git a/Dockerfile/java/payment_Dockerfile b/Dockerfile/java/payment_Dockerfile new file mode 100644 index 0000000..1eed53c --- /dev/null +++ b/Dockerfile/java/payment_Dockerfile @@ -0,0 +1,25 @@ +# 使用官方 Java 21 精简镜像（含JDK，适合运行Spring Boot等Java应用） +FROM mirror.ccs.tencentyun.com/library/openjdk:21-jdk-slim AS runtime + +# 配置环境变量（解决中文乱码、时区问题） +ENV LANG=C.UTF-8 \ + TZ=Asia/Shanghai \ + JAVA_OPTS="" + +# 创建应用工作目录 +WORKDIR /app + +# 复制主应用JAR 和 API JAR +COPY flymoon-payment-provider/target/flymoon-payment.jar /app/flymoon-payment.jar +COPY flymoon-payment-api/target/flymoon-payment-api.jar /app/flymoon-payment-api.jar + + +# 暴露应用端口（根据实际端口修改，如8080、9090等） +EXPOSE 8090 + +# 默认启动环境sit，可被覆盖，外部使用-e or env SPRING_PROFILES_ACTIVE=xxx覆盖 +ARG RUN_PROFILE=sit +ENV SPRING_PROFILES_ACTIVE=${RUN_PROFILE} + +# 启动命令（支持外部传入JVM参数，如 -Xms512m -Xmx1024m） +ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/flymoon-payment.jar --spring.profiles.active=${SPRING_PROFILES_ACTIVE}"] \ No newline at end of file diff --git a/Dockerfile/python/lessie-sourcing-agents/Dockerfile b/Dockerfile/python/lessie-sourcing-agents/Dockerfile new file mode 100644 index 0000000..b4508a6 --- /dev/null +++ b/Dockerfile/python/lessie-sourcing-agents/Dockerfile @@ -0,0 +1,71 @@ +FROM uswccr.ccs.tencentyun.com/lessie/python:3.12-slim AS builder + +ENV PYTHONDONTWRITEBYTECODE=1 \ + PYTHONUNBUFFERED=1 + +WORKDIR /data/webapps/lessie_sourcing_agents + +# Install build prerequisites required for native wheels, then remove leftover apt metadata. +RUN apt-get update && apt-get install -y --no-install-recommends \ + build-essential \ + ca-certificates \ + cmake \ + curl \ + git \ + libomp-dev \ + libopenblas-dev \ + ninja-build \ + pkg-config \ + && \ + rm -rf /var/lib/apt/lists/* + +RUN python -m pip install --no-cache-dir "uv" + +COPY pyproject.toml uv.lock requirements.in requirements.txt ./ + +# RUN python -m uv venv --python /usr/local/bin/python /opt/venv && \ +# python -m uv pip install --python /opt/venv/bin/python --no-cache -r requirements.txt + +ENV UV_PROJECT_ENVIRONMENT=/opt/venv + +RUN python -m uv venv /opt/venv && \ + python -m uv sync --frozen --no-dev --python /usr/local/bin/python + +FROM uswccr.ccs.tencentyun.com/lessie/python:3.12-slim AS runtime + +ARG APP_PORT=8000 + +ENV APP_ENV=local \ + APP_PORT=${APP_PORT} + +WORKDIR /data/webapps/lessie_sourcing_agents + +# Runtime dependencies required by packages like faiss-cpu. +RUN apt-get update && apt-get install -y --no-install-recommends \ + libgomp1 \ + libomp5 \ + libopenblas0 \ + && \ + rm -rf /var/lib/apt/lists/* + +# Bring in the pre-built virtual environment from the builder stage. +COPY --from=builder /opt/venv /opt/venv + +# Ship only the application sources in the runtime image. +COPY . . + +ENV PATH="/opt/venv/bin:${PATH}" \ + VIRTUAL_ENV="/opt/venv" + +EXPOSE ${APP_PORT} + +RUN mkdir -p /data/webapps/lessie_sourcing_agents/logs + +COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh +RUN chmod +x /usr/local/bin/docker-entrypoint.sh + +ENV LOG_DIR=/data/webapps/lessie_sourcing_agents/logs + +VOLUME ["/data/webapps/lessie_sourcing_agents/logs"] + +ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/Dockerfile/python/lessie-sourcing-agents/docker-entrypoint.sh b/Dockerfile/python/lessie-sourcing-agents/docker-entrypoint.sh new file mode 100644 index 0000000..67372d1 --- /dev/null +++ b/Dockerfile/python/lessie-sourcing-agents/docker-entrypoint.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +set -euo pipefail + +APP_HOST="${HOST:-0.0.0.0}" +APP_PORT="${APP_PORT:-8000}" +APP_ENV_VALUE="${APP_ENV:-s2}" +LOG_DIRECTORY="${LOG_DIR:-/data/webapps/lessie_sourcing_agents/logs}" +TIMESTAMP="$(date +"%Y%m%d_%H%M%S")" +LOGFILE="${LOG_DIRECTORY}/lessie_sourcing_agents_${TIMESTAMP}.log" +LATEST_LINK="${LOG_DIRECTORY}/lessie_sourcing_agents_latest.log" +GUNICORN_WORKERS="${GUNICORN_WORKERS:-8}" +GUNICORN_TIMEOUT="${GUNICORN_TIMEOUT:-300}" +GUNICORN_WORKER_CLASS="${GUNICORN_WORKER_CLASS:-uvicorn.workers.UvicornWorker}" +GUNICORN_MODULE="${GUNICORN_MODULE:-dialogue.app:app}" + +mkdir -p "${LOG_DIRECTORY}" +touch "${LOGFILE}" +ln -sf "${LOGFILE}" "${LATEST_LINK}" + +echo "Starting gunicorn (${GUNICORN_MODULE}) with APP_ENV=${APP_ENV_VALUE}, logs -> ${LOGFILE}" + +exec env APP_ENV="${APP_ENV_VALUE}" \ + gunicorn \ + -w "${GUNICORN_WORKERS}" \ + -k "${GUNICORN_WORKER_CLASS}" \ + -b "${APP_HOST}:${APP_PORT}" \ + --timeout "${GUNICORN_TIMEOUT}" \ + "${GUNICORN_MODULE}" \ + > >(tee -a "${LOGFILE}") \ + 2> >(tee -a "${LOGFILE}" >&2) diff --git a/SCM/build_image_lessie_agents_test.groovy b/SCM/build_image_flymoon_admin.groovy similarity index 85% rename from SCM/build_image_lessie_agents_test.groovy rename to SCM/build_image_flymoon_admin.groovy index 4f1b9de..6bceccb 100644 --- a/SCM/build_image_lessie_agents_test.groovy +++ b/SCM/build_image_flymoon_admin.groovy @@ -1,39 +1,43 @@ pipeline { agent any - + tools{ + maven 'mvn3.8.8' + jdk 'jdk21' + } parameters { gitParameter( branchFilter: 'origin/(.*)', - defaultValue: 'master', + defaultValue: 'dxin', name: 'Code_branch', type: 'PT_BRANCH', selectedValue: 'DEFAULT', sortMode: 'NONE', - description: '选择代码分支，默认master分支', + description: '选择代码分支: ', quickFilterEnabled: true, tagFilter: '*', listSize: "1" ) + choice( + name: 'BUILD_env', + choices: ['sit', 'test', 'prod'], + description: '选择构建的环境配置：' + ) } - environment { REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 - NAMESPACE = "lessietest" // 命名空间 - IMAGE_NAME = "lessie-sourcing-agents" // 镜像名（固定前缀） + NAMESPACE = "lessie${params.BUILD_env}" // 命名空间根据choices的选择拼接 + IMAGE_NAME = "flymoon-admin" // 镜像名（固定前缀） CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID } stages { stage('拉取代码') { steps { - // 拉取指定分支代码（通过参数 params.Code_branch 动态指定） - git branch: "${params.Code_branch}", - credentialsId: 'fly_gitlab_auth', - url: 'http://106.53.194.199/python/lessie-sourcing-agents.git' + git branch: "${params.Code_branch}", credentialsId: 'fly_gitlab_auth', url: 'http://106.53.194.199/root/fly_moon_admin.git' } } - stage('获取提交信息') { + stage('获取信息') { steps { script { // 获取最近一次提交的哈希值（短格式，前8位） @@ -60,6 +64,12 @@ pipeline { } } + stage('Maven 编译') { + steps { + sh "cd ${WORKSPACE}/ && mvn clean install -P ${params.BUILD_env} -Dmaven.test.skip=true" + } + } + stage('登录容器仓库') { steps { withCredentials([usernamePassword( @@ -79,7 +89,8 @@ pipeline { script { // 构建镜像，添加标签信息 sh """ - docker build -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ + docker build --build-arg BUILD_PROFILE=${params.BUILD_env} \ + -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ --label "git-branch='${params.Code_branch}'" \ --label "git-commit='${GIT_COMMIT_SHORT}'" \ --label "git-author='${GIT_AUTHOR}'" \ @@ -116,7 +127,7 @@ pipeline { def currentImageId = sh(script: "docker images -q ${imagePrefix}:${IMAGE_TAG}", returnStdout: true).trim() // 获取所有该镜像的本地版本（按创建时间排序） def allImages = sh(script: "docker images ${imagePrefix} --format '{{.ID}} {{.Tag}}' | sort -rk2", returnStdout: true).trim().split('\n') - if (allImages.size() > keepCount + 1) { // +1 是因为还要保留 latest + if (allImages.size() > keepCount + 1) { // +1 保留 latest def oldImages = allImages.drop(keepCount + 1) echo "发现 ${oldImages.size()} 个旧镜像需要清理" diff --git a/SCM/build_image_go_lessie_sourcing_api.groovy b/SCM/build_image_go_lessie_sourcing_api.groovy new file mode 100644 index 0000000..6e2f61e --- /dev/null +++ b/SCM/build_image_go_lessie_sourcing_api.groovy @@ -0,0 +1,170 @@ +pipeline { + agent any + tools{ + go 'go1.24.0' + } + parameters { + gitParameter( + branchFilter: 'origin/(.*)', + defaultValue: 'dxin', + name: 'Code_branch', + type: 'PT_BRANCH', + selectedValue: 'DEFAULT', + sortMode: 'NONE', + description: '选择代码分支: ', + quickFilterEnabled: true, + tagFilter: '*', + listSize: "1" + ) + choice( + name: 'BUILD_env', + choices: ['sit', 'test', 'prod'], + description: '选择构建的环境配置：' + ) + } + environment { + REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 + NAMESPACE = "lessie${params.BUILD_env}" // 命名空间根据choices的选择拼接 + IMAGE_NAME = "go_lessie-sourcing-api" // 镜像名（固定前缀） + CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID + } + stages { + stage('Checkout代码') { + steps { + echo "阶段一" + git branch: "${params.Code_branch}", credentialsId: 'fly_gitlab_auth', url: 'http://106.53.194.199/go/lessie-sourcing-api.git' + } + } + stage('获取信息') { + steps { + script { + // 获取最近一次提交的哈希值（短格式，前8位） + env.GIT_COMMIT_SHORT = sh(script: 'git rev-parse --short HEAD',returnStdout: true).trim() + // 获取最近一次提交的作者 + env.GIT_AUTHOR = sh(script: 'git log -1 --pretty=format:%an',returnStdout: true).trim() + // 获取最近一次提交的时间（格式化） + env.GIT_COMMIT_TIME = sh( + script: 'git log -1 --pretty=format:%ct | xargs -I {} date -d @{} +%Y%m%d-%H%M%S', + returnStdout: true + ).trim() + // 获取最近一次提交的备注信息（转义特殊字符，避免构建失败） + env.GIT_COMMIT_MSG = sh(script: 'git log -1 --pretty=format:%s | sed -e \'s/"/\\"/g\'', returnStdout: true).trim() + // Jenkins构建次数 + def buildNumber = env.BUILD_NUMBER // Jenkins内置变量，直接获取当前Job的构建序号 + // 当前分支名（处理/为-，如feature/docker_1015 → feature-docker_1015） + def branchName = sh(script: 'git rev-parse --abbrev-ref HEAD', returnStdout: true).trim() + def formattedBranch = branchName.replace('/', '-').replace('_', '-') // 替换分支名中的/和_为- + // 构建时间（格式：202510181215，年-月-日-时-分，无分隔符） + def buildTime = sh(script: 'date +%Y%m%d%H%M', returnStdout: true).trim() + // 最终Tag（格式：v+构建次数_分支名_短哈希_构建时间） + env.IMAGE_TAG = "v${buildNumber}_${formattedBranch}_${GIT_COMMIT_SHORT}_${buildTime}" + } + } + } + stage('依赖&构建') { + steps { + sh """ + cd ${WORKSPACE}/ + export GOVCS="git.deeplink.media:git,*:git" + echo "Jenkins 当前使用的 Go 路径：\$(which go)" + echo "Jenkins 当前使用的 Go 版本：\$(go version)" + echo "拉依赖" + go mod tidy -v -x + make build-linux + chmod +x ./build/lessie-sourcing-api + """ + } + } + stage('登录容器仓库') { + steps { + withCredentials([usernamePassword( + credentialsId: env.CREDENTIALS_ID, + usernameVariable: 'REGISTRY_USER', + passwordVariable: 'REGISTRY_PWD' + )]) { + sh ''' + echo "$REGISTRY_PWD" | docker login ${REGISTRY} -u ${REGISTRY_USER} --password-stdin + ''' + } + } + } + stage('构建容器镜像') { + steps { + script { + // 构建镜像，添加标签信息 + sh """ + docker build -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ + --label "git-branch='${params.Code_branch}'" \ + --label "git-commit='${GIT_COMMIT_SHORT}'" \ + --label "git-author='${GIT_AUTHOR}'" \ + --label "git-message='${GIT_COMMIT_MSG}'" \ + --label "build-time='${GIT_COMMIT_TIME}'" \ + . + """ + } + } + } + stage('推送镜像到仓库') { + steps { + script { + // 推送主镜像（带唯一 Tag） + sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + + // 推送 latest 标签（包含命名空间） + sh "docker tag ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + } + } + } + } + post { + always { + script { + echo "开始清理本地旧镜像，仅保留最近 3 个构建版本 + latest" + // 保留镜像数量 + def keepCount = 3 + def imagePrefix = "${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}" + // 获取当前镜像的 IMAGE ID + def currentImageId = sh(script: "docker images -q ${imagePrefix}:${IMAGE_TAG}", returnStdout: true).trim() + // 获取所有该镜像的本地版本（按创建时间排序） + def allImages = sh(script: "docker images ${imagePrefix} --format '{{.ID}} {{.Tag}}' | sort -rk2", returnStdout: true).trim().split('\n') + if (allImages.size() > keepCount + 1) { // +1 保留 latest + def oldImages = allImages.drop(keepCount + 1) + echo "发现 ${oldImages.size()} 个旧镜像需要清理" + + oldImages.each { line -> + def parts = line.split(' ') + def imageId = parts[0] + def tag = parts[1] + + // 跳过 latest + if (tag != "latest") { + echo "删除旧镜像: ${imagePrefix}:${tag}" + sh "docker rmi -f ${imagePrefix}:${tag} || true" + } + } + } else { + echo "当前镜像数未超过 ${keepCount + 1} 个，无需清理" + } + sh """ + echo "当前镜像状态：" + docker images ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}\\t{{.Size}}' + """ + // 无论成败都登出，清理凭证 + sh "docker logout ${REGISTRY}" + echo "容器仓库已登出，本地凭证已清理" + } + } + success { + // 输出构建结果 + echo "镜像构建成功！" + echo "镜像地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + echo "latest 标签地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest" + echo "对应代码提交：${GIT_COMMIT_SHORT}（${GIT_COMMIT_MSG}）" + } + failure { + // 输出构建结果 + echo "镜像构建失败！" + } + } +} \ No newline at end of file diff --git a/SCM/build_image_lessie_agents_prod.groovy b/SCM/build_image_lessie_sourcing_agents.groovy similarity index 96% rename from SCM/build_image_lessie_agents_prod.groovy rename to SCM/build_image_lessie_sourcing_agents.groovy index e1b0e88..8370e6c 100644 --- a/SCM/build_image_lessie_agents_prod.groovy +++ b/SCM/build_image_lessie_sourcing_agents.groovy @@ -14,11 +14,15 @@ pipeline { tagFilter: '*', listSize: "1" ) + choice( + name: 'BUILD_env', + choices: ['sit', 'test', 'prod'], + description: '选择构建的环境配置：' + ) } - environment { REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 - NAMESPACE = "lessieprod" // 命名空间 + NAMESPACE = "lessie${params.BUILD_env}" // 命名空间 IMAGE_NAME = "lessie-sourcing-agents" // 镜像名（固定前缀） CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID } diff --git a/java/us_prod_fly_moon_admin.pipeline b/old_pipeline/java/us_prod_fly_moon_admin.pipeline similarity index 100% rename from java/us_prod_fly_moon_admin.pipeline rename to old_pipeline/java/us_prod_fly_moon_admin.pipeline diff --git a/java/us_prod_flymoon_agent.pipeline b/old_pipeline/java/us_prod_flymoon_agent.pipeline similarity index 100% rename from java/us_prod_flymoon_agent.pipeline rename to old_pipeline/java/us_prod_flymoon_agent.pipeline diff --git a/java/us_prod_flymoon_email.pipeline b/old_pipeline/java/us_prod_flymoon_email.pipeline similarity index 100% rename from java/us_prod_flymoon_email.pipeline rename to old_pipeline/java/us_prod_flymoon_email.pipeline diff --git a/java/us_prod_flymoon_payment.pipeline b/old_pipeline/java/us_prod_flymoon_payment.pipeline similarity index 100% rename from java/us_prod_flymoon_payment.pipeline rename to old_pipeline/java/us_prod_flymoon_payment.pipeline diff --git a/python/oversea_prod_lessie_sourcing_agents.pipeline b/old_pipeline/python/oversea_prod_lessie_sourcing_agents.pipeline similarity index 100% rename from python/oversea_prod_lessie_sourcing_agents.pipeline rename to old_pipeline/python/oversea_prod_lessie_sourcing_agents.pipeline diff --git a/python/tmp.groovy b/old_pipeline/python/tmp.groovy similarity index 100% rename from python/tmp.groovy rename to old_pipeline/python/tmp.groovy diff --git a/python/us_prod_flymoon_api_monitor.pipeline b/old_pipeline/python/us_prod_flymoon_api_monitor.pipeline similarity index 100% rename from python/us_prod_flymoon_api_monitor.pipeline rename to old_pipeline/python/us_prod_flymoon_api_monitor.pipeline