diff --git a/Jenkinsfile b/Jenkinsfile index a2454fb6b..5b5ba69f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,12 +67,12 @@ pipeline { choice(name: 'ENVIRONMENT', choices: ['test', 'staging', 'production'], description: '部署环境') booleanParam(name: 'DEPLOY', defaultValue: false, description: '构建成功后是否部署') booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: '是否跳过测试;生产构建不建议勾选') - string(name: 'IMAGE_REPOSITORY', defaultValue: 'registry.example.com/your-group/baiyue-firstleg', description: 'GitLab Container Registry 项目地址') + string(name: 'IMAGE_REPOSITORY', defaultValue: '8.163.30.128:10082/java-project/baiyue-firstleg', description: 'Gitea 容器镜像仓库地址') string(name: 'DOCKER_BASE_IMAGE', defaultValue: 'docker.m.daocloud.io/library/eclipse-temurin:17-jre-alpine', description: 'Java 17 基础镜像;默认使用国内镜像代理') } environment { - REGISTRY_CREDENTIALS = 'gitlab-registry-credentials' + REGISTRY_CREDENTIALS = 'gitea-test-token' MAVEN_SETTINGS = 'deploy/maven/settings-cn.xml' MAVEN_OPTS = '-Dfile.encoding=UTF-8 -Dmaven.wagon.http.retryHandler.count=3' } diff --git a/deploy/env/.env.test.example b/deploy/env/.env.test.example index 811a3d95d..794a5141f 100644 --- a/deploy/env/.env.test.example +++ b/deploy/env/.env.test.example @@ -1,6 +1,6 @@ # 复制本文件仅用于本地验证。Jenkins 中应创建“Secret file”凭据,禁止提交真实 .env。 DEPLOY_ENV=test -IMAGE_REPOSITORY=registry.example.com/your-group/baiyue-firstleg +IMAGE_REPOSITORY=8.163.30.128:10082/java-project/baiyue-firstleg IMAGE_TAG=latest INFRA_NETWORK=firstleg-test-infra-network diff --git a/docs/jenkins-multi-service-deployment.md b/docs/jenkins-multi-service-deployment.md index 1cbab027a..b574a6e52 100644 --- a/docs/jenkins-multi-service-deployment.md +++ b/docs/jenkins-multi-service-deployment.md @@ -34,7 +34,7 @@ Jenkins 执行用户必须有运行 Docker 的权限。部署脚本当前在 Jen | Credentials ID | 类型 | 内容 | | --- | --- | --- | -| `gitlab-registry-credentials` | Username with password | GitLab Deploy Token 用户名和令牌,至少有 `read_registry`、`write_registry` 权限 | +| `gitea-test-token` | Username with password | Gitea 用户名和访问令牌,令牌需要代码读取及容器包读写权限 | | `firstleg-test-env` | Secret file | 根据 `.env.test.example` 创建的测试环境 `.env` | | `firstleg-staging-env` | Secret file | 预发布环境 `.env`,使用预发布基础设施地址和密钥 | | `firstleg-production-env` | Secret file | 生产环境 `.env`,使用生产基础设施地址和密钥 | @@ -50,7 +50,7 @@ GitLab 仓库拉取如果不是由 Jenkins GitLab 集成统一授权,还需单 | `ENVIRONMENT` | `test` | 可选 `test`、`staging`、`production` | | `DEPLOY` | 测试环境勾选 | 是否在镜像推送后执行部署 | | `SKIP_TESTS` | 不勾选 | 临时调试才跳过测试 | -| `IMAGE_REPOSITORY` | GitLab 项目镜像地址 | 示例 `gitlab.example.com/logistics/baiyue-firstleg` | +| `IMAGE_REPOSITORY` | Gitea 容器镜像地址 | 当前测试环境为 `8.163.30.128:10082/java-project/baiyue-firstleg` | | `DOCKER_BASE_IMAGE` | 保持默认 | 默认通过国内镜像代理拉取 Java 17 运行时,也可替换为企业内部镜像地址 | 公共模块、根 POM 或 Dockerfile 变化会构建全部 11 个服务。仅 `order/**` 变化时执行: