KTeam/kt-template-online-api
1
0
Fork 0
mirror of https://github.com/KwiTsukasa/kt-template-online-api.git synced 2026-05-27 15:44:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复 K8s 发布 registry 空参数

Browse Source
This commit is contained in:
sunlei 2026-05-16 16:19:38 +08:00
parent d742a2fb16
commit a30b6667b2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

@ -83,9 +83,12 @@ pipeline {
def publishPattern = params.PUBLISH_BRANCH_PATTERN?.trim() ?: '^(main|master|release/.+)$' def publishPattern = params.PUBLISH_BRANCH_PATTERN?.trim() ?: '^(main|master|release/.+)$'
env.IS_PUBLISH_BRANCH = (!env.CHANGE_ID && isPublishBranch(env.BRANCH_NAME ?: '', publishPattern)) ? 'true' : 'false' env.IS_PUBLISH_BRANCH = (!env.CHANGE_ID && isPublishBranch(env.BRANCH_NAME ?: '', publishPattern)) ? 'true' : 'false'
def registry = params.DOCKER_REGISTRY?.trim() def registry = params.DOCKER_REGISTRY?.trim()
// Jenkins 已创建任务会缓存旧参数值；K8s 模式下空 registry 自动回退到 NAS 本地 registry。
if (params.DEPLOY_TARGET == 'k8s' && !registry) { if (params.DEPLOY_TARGET == 'k8s' && !registry) {
error('DOCKER_REGISTRY is required when DEPLOY_TARGET=k8s.') registry = 'k3d-kt-registry.localhost:5000'
echo "DOCKER_REGISTRY is empty, fallback to ${registry} for K8s deploy."
} }
env.DOCKER_REGISTRY_EFFECTIVE = registry ?: ''
env.DOCKER_IMAGE = registry ? "${registry}/${params.IMAGE_NAME}:${env.IMAGE_TAG_FINAL}" : "${params.IMAGE_NAME}:${env.IMAGE_TAG_FINAL}" env.DOCKER_IMAGE = registry ? "${registry}/${params.IMAGE_NAME}:${env.IMAGE_TAG_FINAL}" : "${params.IMAGE_NAME}:${env.IMAGE_TAG_FINAL}"
env.DOCKER_IMAGE_LATEST = registry ? "${registry}/${params.IMAGE_NAME}:latest" : "${params.IMAGE_NAME}:latest" env.DOCKER_IMAGE_LATEST = registry ? "${registry}/${params.IMAGE_NAME}:latest" : "${params.IMAGE_NAME}:latest"
@ -135,6 +138,7 @@ pipeline {
Branch: ${env.BRANCH_NAME ?: '-'} Branch: ${env.BRANCH_NAME ?: '-'}
Change request: ${env.CHANGE_ID ?: '-'} Change request: ${env.CHANGE_ID ?: '-'}
Tag: ${env.TAG_NAME ?: '-'} Tag: ${env.TAG_NAME ?: '-'}
Docker registry: ${env.DOCKER_REGISTRY_EFFECTIVE ?: '-'}
Docker image: ${env.DOCKER_IMAGE} Docker image: ${env.DOCKER_IMAGE}
Docker latest: ${env.DOCKER_IMAGE_LATEST} Docker latest: ${env.DOCKER_IMAGE_LATEST}
Deploy target: ${params.DEPLOY_TARGET} Deploy target: ${params.DEPLOY_TARGET}
@ -217,7 +221,7 @@ pipeline {
} }
steps { steps {
script { script {
if (params.DOCKER_REGISTRY?.trim()) { if (env.DOCKER_REGISTRY_EFFECTIVE?.trim()) {
runCmd(""" runCmd("""
docker push ${env.DOCKER_IMAGE} docker push ${env.DOCKER_IMAGE}
docker push ${env.DOCKER_IMAGE_LATEST} docker push ${env.DOCKER_IMAGE_LATEST}