refactor(jenkins): 简化 Jenkinsfile 版本管理和部署流程
- 移除复杂的版本策略参数,统一使用自动递增版本号 - 修改 Docker 镜像标签策略,使用 latest 标签进行部署 - 简化版本计算逻辑,统一维护服务版本文件 - 更新部署脚本,直接使用 latest 标签拉取镜像 - 添加版本文件自动提交到 Git 的功能 - 重构版本记录更新机制,使用 Python 脚本管理 versions.json - 统一所有 Jenkinsfile 的环境变量和构建参数结构
这个提交包含在:
父节点
6b94c30628
当前提交
500eca8d6a
@ -1,10 +1,6 @@
|
|||||||
pipeline {
|
pipeline {
|
||||||
agent any
|
agent any
|
||||||
|
|
||||||
parameters {
|
|
||||||
string(name: 'IMAGE_TAG', defaultValue: 'latest', description: '镜像 Tag')
|
|
||||||
}
|
|
||||||
|
|
||||||
environment {
|
environment {
|
||||||
ACR_REGISTRY = 'crpi-n44qjpuucgjt8e8c.cn-beijing.personal.cr.aliyuncs.com'
|
ACR_REGISTRY = 'crpi-n44qjpuucgjt8e8c.cn-beijing.personal.cr.aliyuncs.com'
|
||||||
ACR_NAMESPACE = 'xuqmgroup'
|
ACR_NAMESPACE = 'xuqmgroup'
|
||||||
@ -12,11 +8,13 @@ pipeline {
|
|||||||
PROD_HOST = '106.54.23.149'
|
PROD_HOST = '106.54.23.149'
|
||||||
PROD_USER = 'ubuntu'
|
PROD_USER = 'ubuntu'
|
||||||
COMPOSE_FILE = '/opt/xuqm/deploy/compose.production.yaml'
|
COMPOSE_FILE = '/opt/xuqm/deploy/compose.production.yaml'
|
||||||
|
VERSIONS_FILE = '/opt/xuqm/deploy/versions.json'
|
||||||
DOCKER_BUILDKIT = '1'
|
DOCKER_BUILDKIT = '1'
|
||||||
IMAGE_NAME = 'ops-web'
|
IMAGE_NAME = 'ops-web'
|
||||||
DOCKERFILE = 'Dockerfile.ops'
|
DOCKERFILE = 'Dockerfile.ops'
|
||||||
DEPLOY_SERVICE = 'ops-web'
|
DEPLOY_SERVICE = 'ops-web'
|
||||||
BUILD_ARGS = '--build-arg OPS_APP_BASE=/ --build-arg OPS_API_BASE_URL=/api'
|
BUILD_ARGS = '--build-arg OPS_APP_BASE=/ --build-arg OPS_API_BASE_URL=/api'
|
||||||
|
VERSION_FILE = 'VERSION.ops-web'
|
||||||
}
|
}
|
||||||
|
|
||||||
options {
|
options {
|
||||||
@ -37,21 +35,39 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stage('Resolve Version') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
def current = fileExists(env.VERSION_FILE) ? readFile(env.VERSION_FILE).trim() : '1.0.0'
|
||||||
|
def parts = current.tokenize('.')
|
||||||
|
while (parts.size() < 3) parts.add('0')
|
||||||
|
def newVer = "${parts[0]}.${parts[1]}.${parts[2].toInteger() + 1}"
|
||||||
|
env.IMAGE_VERSION = newVer
|
||||||
|
writeFile file: env.VERSION_FILE, text: newVer
|
||||||
|
echo "${env.IMAGE_NAME}: ${current} → ${newVer}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
stage('Docker Build & Push') {
|
stage('Docker Build & Push') {
|
||||||
steps {
|
steps {
|
||||||
withCredentials([string(credentialsId: 'ACR_PASSWORD', variable: 'ACR_PASS')]) {
|
withCredentials([string(credentialsId: 'ACR_PASSWORD', variable: 'ACR_PASS')]) {
|
||||||
script {
|
script {
|
||||||
def fullImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${params.IMAGE_TAG}"
|
def base = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}"
|
||||||
|
def versionedImage = "${base}:${env.IMAGE_VERSION}"
|
||||||
|
def latestImage = "${base}:latest"
|
||||||
def gitCommit = env.GIT_COMMIT ?: 'unknown'
|
def gitCommit = env.GIT_COMMIT ?: 'unknown'
|
||||||
bat """
|
bat """
|
||||||
docker login ${env.ACR_REGISTRY} -u ${env.ACR_USERNAME} -p %ACR_PASS%
|
docker login ${env.ACR_REGISTRY} -u ${env.ACR_USERNAME} -p %ACR_PASS%
|
||||||
if %errorlevel% neq 0 exit /b 1
|
if %errorlevel% neq 0 exit /b 1
|
||||||
docker pull --platform=linux/amd64 ${fullImage} || echo Pull failed, will build fresh
|
docker pull --platform=linux/amd64 ${latestImage} || echo Pull failed, will build fresh
|
||||||
docker build --platform=linux/amd64 -f ${env.DOCKERFILE} ${env.BUILD_ARGS} --build-arg GIT_COMMIT=${gitCommit} --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${fullImage} -t ${fullImage} .
|
docker build --platform=linux/amd64 -f ${env.DOCKERFILE} ${env.BUILD_ARGS} --build-arg GIT_COMMIT=${gitCommit} --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${latestImage} -t ${versionedImage} -t ${latestImage} .
|
||||||
if %errorlevel% neq 0 exit /b 1
|
if %errorlevel% neq 0 exit /b 1
|
||||||
docker push ${fullImage}
|
docker push ${versionedImage}
|
||||||
if %errorlevel% neq 0 exit /b 1
|
if %errorlevel% neq 0 exit /b 1
|
||||||
docker rmi ${fullImage}
|
docker push ${latestImage}
|
||||||
|
if %errorlevel% neq 0 exit /b 1
|
||||||
|
docker rmi ${versionedImage} ${latestImage}
|
||||||
exit /b 0
|
exit /b 0
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@ -64,21 +80,50 @@ pipeline {
|
|||||||
lock('prod-deploy') {
|
lock('prod-deploy') {
|
||||||
withCredentials([sshUserPrivateKey(credentialsId: 'PROD_SSH_KEY', keyFileVariable: 'SSH_KEY')]) {
|
withCredentials([sshUserPrivateKey(credentialsId: 'PROD_SSH_KEY', keyFileVariable: 'SSH_KEY')]) {
|
||||||
script {
|
script {
|
||||||
def fullImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${params.IMAGE_TAG}"
|
def latestImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:latest"
|
||||||
retry(2) {
|
retry(2) {
|
||||||
bat """
|
bat """
|
||||||
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "docker image prune -f 2>/dev/null || true; docker pull ${fullImage} || exit 1; docker compose -f ${env.COMPOSE_FILE} up -d --no-deps --force-recreate ${env.DEPLOY_SERVICE} || exit 1; docker image prune -f"
|
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "docker image prune -f 2>/dev/null || true; docker pull ${latestImage} || exit 1; docker compose -f ${env.COMPOSE_FILE} up -d --no-deps --force-recreate ${env.DEPLOY_SERVICE} || exit 1; docker image prune -f"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
def releasedAt = new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone('UTC'))
|
||||||
|
def updateScript = """\
|
||||||
|
import json, os
|
||||||
|
path = '${env.VERSIONS_FILE}'
|
||||||
|
d = json.load(open(path)) if os.path.exists(path) else {}
|
||||||
|
d.setdefault('services', {})['${env.DEPLOY_SERVICE}'] = {'version': '${env.IMAGE_VERSION}', 'changed': True}
|
||||||
|
d['releasedAt'] = '${releasedAt}'
|
||||||
|
json.dump(d, open(path, 'w'), indent=2, ensure_ascii=False)
|
||||||
|
print('versions.json updated: ${env.DEPLOY_SERVICE} = ${env.IMAGE_VERSION}')
|
||||||
|
""".stripIndent()
|
||||||
|
writeFile file: 'update_versions.py', text: updateScript
|
||||||
|
bat """
|
||||||
|
scp -i "%SSH_KEY%" -o StrictHostKeyChecking=no update_versions.py ${env.PROD_USER}@${env.PROD_HOST}:/tmp/update_versions.py
|
||||||
|
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "python3 /tmp/update_versions.py && rm /tmp/update_versions.py"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stage('Commit Version') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
bat """
|
||||||
|
git config user.email "jenkins@xuqm.com"
|
||||||
|
git config user.name "Jenkins CI"
|
||||||
|
git add ${env.VERSION_FILE}
|
||||||
|
git diff --cached --quiet || git commit -m "ci: bump ${env.IMAGE_NAME} to ${env.IMAGE_VERSION} [skip ci]"
|
||||||
|
git push origin HEAD:main
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
post {
|
post {
|
||||||
success { echo "✅ ${env.IMAGE_NAME}:${params.IMAGE_TAG} 构建部署成功" }
|
success { echo "✅ ${env.IMAGE_NAME}:${env.IMAGE_VERSION} 构建部署成功" }
|
||||||
failure { echo "❌ 构建失败,请检查日志" }
|
failure { echo "❌ 构建失败,请检查日志" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
pipeline {
|
pipeline {
|
||||||
agent any
|
agent any
|
||||||
|
|
||||||
parameters {
|
|
||||||
string(name: 'IMAGE_TAG', defaultValue: 'latest', description: '镜像 Tag')
|
|
||||||
}
|
|
||||||
|
|
||||||
environment {
|
environment {
|
||||||
ACR_REGISTRY = 'crpi-n44qjpuucgjt8e8c.cn-beijing.personal.cr.aliyuncs.com'
|
ACR_REGISTRY = 'crpi-n44qjpuucgjt8e8c.cn-beijing.personal.cr.aliyuncs.com'
|
||||||
ACR_NAMESPACE = 'xuqmgroup'
|
ACR_NAMESPACE = 'xuqmgroup'
|
||||||
@ -12,11 +8,13 @@ pipeline {
|
|||||||
PROD_HOST = '106.54.23.149'
|
PROD_HOST = '106.54.23.149'
|
||||||
PROD_USER = 'ubuntu'
|
PROD_USER = 'ubuntu'
|
||||||
COMPOSE_FILE = '/opt/xuqm/deploy/compose.production.yaml'
|
COMPOSE_FILE = '/opt/xuqm/deploy/compose.production.yaml'
|
||||||
|
VERSIONS_FILE = '/opt/xuqm/deploy/versions.json'
|
||||||
DOCKER_BUILDKIT = '1'
|
DOCKER_BUILDKIT = '1'
|
||||||
IMAGE_NAME = 'tenant-web'
|
IMAGE_NAME = 'tenant-web'
|
||||||
DOCKERFILE = 'Dockerfile.tenant'
|
DOCKERFILE = 'Dockerfile.tenant'
|
||||||
DEPLOY_SERVICE = 'tenant-web'
|
DEPLOY_SERVICE = 'tenant-web'
|
||||||
BUILD_ARGS = '--build-arg TENANT_APP_BASE=/ --build-arg TENANT_API_BASE_URL=/api'
|
BUILD_ARGS = '--build-arg TENANT_APP_BASE=/ --build-arg TENANT_API_BASE_URL=/api'
|
||||||
|
VERSION_FILE = 'VERSION.tenant-web'
|
||||||
}
|
}
|
||||||
|
|
||||||
options {
|
options {
|
||||||
@ -37,21 +35,39 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stage('Resolve Version') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
def current = fileExists(env.VERSION_FILE) ? readFile(env.VERSION_FILE).trim() : '1.0.0'
|
||||||
|
def parts = current.tokenize('.')
|
||||||
|
while (parts.size() < 3) parts.add('0')
|
||||||
|
def newVer = "${parts[0]}.${parts[1]}.${parts[2].toInteger() + 1}"
|
||||||
|
env.IMAGE_VERSION = newVer
|
||||||
|
writeFile file: env.VERSION_FILE, text: newVer
|
||||||
|
echo "${env.IMAGE_NAME}: ${current} → ${newVer}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
stage('Docker Build & Push') {
|
stage('Docker Build & Push') {
|
||||||
steps {
|
steps {
|
||||||
withCredentials([string(credentialsId: 'ACR_PASSWORD', variable: 'ACR_PASS')]) {
|
withCredentials([string(credentialsId: 'ACR_PASSWORD', variable: 'ACR_PASS')]) {
|
||||||
script {
|
script {
|
||||||
def fullImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${params.IMAGE_TAG}"
|
def base = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}"
|
||||||
|
def versionedImage = "${base}:${env.IMAGE_VERSION}"
|
||||||
|
def latestImage = "${base}:latest"
|
||||||
def gitCommit = env.GIT_COMMIT ?: 'unknown'
|
def gitCommit = env.GIT_COMMIT ?: 'unknown'
|
||||||
bat """
|
bat """
|
||||||
docker login ${env.ACR_REGISTRY} -u ${env.ACR_USERNAME} -p %ACR_PASS%
|
docker login ${env.ACR_REGISTRY} -u ${env.ACR_USERNAME} -p %ACR_PASS%
|
||||||
if %errorlevel% neq 0 exit /b 1
|
if %errorlevel% neq 0 exit /b 1
|
||||||
docker pull --platform=linux/amd64 ${fullImage} || echo Pull failed, will build fresh
|
docker pull --platform=linux/amd64 ${latestImage} || echo Pull failed, will build fresh
|
||||||
docker build --platform=linux/amd64 -f ${env.DOCKERFILE} ${env.BUILD_ARGS} --build-arg GIT_COMMIT=${gitCommit} --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${fullImage} -t ${fullImage} .
|
docker build --platform=linux/amd64 -f ${env.DOCKERFILE} ${env.BUILD_ARGS} --build-arg GIT_COMMIT=${gitCommit} --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${latestImage} -t ${versionedImage} -t ${latestImage} .
|
||||||
if %errorlevel% neq 0 exit /b 1
|
if %errorlevel% neq 0 exit /b 1
|
||||||
docker push ${fullImage}
|
docker push ${versionedImage}
|
||||||
if %errorlevel% neq 0 exit /b 1
|
if %errorlevel% neq 0 exit /b 1
|
||||||
docker rmi ${fullImage}
|
docker push ${latestImage}
|
||||||
|
if %errorlevel% neq 0 exit /b 1
|
||||||
|
docker rmi ${versionedImage} ${latestImage}
|
||||||
exit /b 0
|
exit /b 0
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@ -64,21 +80,50 @@ pipeline {
|
|||||||
lock('prod-deploy') {
|
lock('prod-deploy') {
|
||||||
withCredentials([sshUserPrivateKey(credentialsId: 'PROD_SSH_KEY', keyFileVariable: 'SSH_KEY')]) {
|
withCredentials([sshUserPrivateKey(credentialsId: 'PROD_SSH_KEY', keyFileVariable: 'SSH_KEY')]) {
|
||||||
script {
|
script {
|
||||||
def fullImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${params.IMAGE_TAG}"
|
def latestImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:latest"
|
||||||
retry(2) {
|
retry(2) {
|
||||||
bat """
|
bat """
|
||||||
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "docker image prune -f 2>/dev/null || true; docker pull ${fullImage} || exit 1; docker compose -f ${env.COMPOSE_FILE} up -d --no-deps --force-recreate ${env.DEPLOY_SERVICE} || exit 1; docker image prune -f"
|
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "docker image prune -f 2>/dev/null || true; docker pull ${latestImage} || exit 1; docker compose -f ${env.COMPOSE_FILE} up -d --no-deps --force-recreate ${env.DEPLOY_SERVICE} || exit 1; docker image prune -f"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
def releasedAt = new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone('UTC'))
|
||||||
|
def updateScript = """\
|
||||||
|
import json, os
|
||||||
|
path = '${env.VERSIONS_FILE}'
|
||||||
|
d = json.load(open(path)) if os.path.exists(path) else {}
|
||||||
|
d.setdefault('services', {})['${env.DEPLOY_SERVICE}'] = {'version': '${env.IMAGE_VERSION}', 'changed': True}
|
||||||
|
d['releasedAt'] = '${releasedAt}'
|
||||||
|
json.dump(d, open(path, 'w'), indent=2, ensure_ascii=False)
|
||||||
|
print('versions.json updated: ${env.DEPLOY_SERVICE} = ${env.IMAGE_VERSION}')
|
||||||
|
""".stripIndent()
|
||||||
|
writeFile file: 'update_versions.py', text: updateScript
|
||||||
|
bat """
|
||||||
|
scp -i "%SSH_KEY%" -o StrictHostKeyChecking=no update_versions.py ${env.PROD_USER}@${env.PROD_HOST}:/tmp/update_versions.py
|
||||||
|
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "python3 /tmp/update_versions.py && rm /tmp/update_versions.py"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stage('Commit Version') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
bat """
|
||||||
|
git config user.email "jenkins@xuqm.com"
|
||||||
|
git config user.name "Jenkins CI"
|
||||||
|
git add ${env.VERSION_FILE}
|
||||||
|
git diff --cached --quiet || git commit -m "ci: bump ${env.IMAGE_NAME} to ${env.IMAGE_VERSION} [skip ci]"
|
||||||
|
git push origin HEAD:main
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
post {
|
post {
|
||||||
success { echo "✅ ${env.IMAGE_NAME}:${params.IMAGE_TAG} 构建部署成功" }
|
success { echo "✅ ${env.IMAGE_NAME}:${env.IMAGE_VERSION} 构建部署成功" }
|
||||||
failure { echo "❌ 构建失败,请检查日志" }
|
failure { echo "❌ 构建失败,请检查日志" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1
VERSION.ops-web
普通文件
1
VERSION.ops-web
普通文件
@ -0,0 +1 @@
|
|||||||
|
1.0.0
|
||||||
1
VERSION.tenant-web
普通文件
1
VERSION.tenant-web
普通文件
@ -0,0 +1 @@
|
|||||||
|
1.0.0
|
||||||
正在加载...
在新工单中引用
屏蔽一个用户