From acfb4974a8329131ff1ea05992c55c94fd467cb4 Mon Sep 17 00:00:00 2001 From: jiangh277 Date: Wed, 24 Dec 2025 16:39:39 +0800 Subject: [PATCH] Revert "build file" This reverts commit 0383bf3afdaab00597b3ce63ff04ce46532dbdc7. --- Jenkinsfile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cebb303..d0c7a97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,6 @@ pipeline { REGISTRY = 'timeline-registry:5000' PROJECT_NAME = 'timeline-server' DOCKER_REGISTRY = 'timeline-registry:5000' - DOCKER_BUILDKIT = '1' // 启用 BuildKit } parameters { @@ -94,28 +93,25 @@ pipeline { stage('Build Docker Images') { steps { script { - // 启用 Docker BuildKit - withEnv(['DOCKER_BUILDKIT=1']) { - def services = ['gateway', 'user', 'story', 'file'] - def imageTags = [:] + def services = ['gateway', 'user', 'story', 'file'] + def imageTags = [:] - for (service in services) { - def serviceDir = "timeline-${service}-service" - def imageName = "${REGISTRY}/timeline-${service}-service:${BUILD_NUMBER}" - def latestImageName = "${REGISTRY}/timeline-${service}-service:latest" + for (service in services) { + def serviceDir = "timeline-${service}-service" + def imageName = "${REGISTRY}/timeline-${service}-service:${BUILD_NUMBER}" + def latestImageName = "${REGISTRY}/timeline-${service}-service:latest" - // 检查Dockerfile是否存在,如果不存在则创建 - if (!fileExists("${serviceDir}/Dockerfile")) { - writeFile file: "${serviceDir}/Dockerfile", text: getDockerfileContent(serviceDir) - } - - // 构建镜像,使用 BuildKit - sh "docker build --platform linux/amd64 -t ${imageName} -t ${latestImageName} ${serviceDir}/." - imageTags[service] = imageName + // 检查Dockerfile是否存在,如果不存在则创建 + if (!fileExists("${serviceDir}/Dockerfile")) { + writeFile file: "${serviceDir}/Dockerfile", text: getDockerfileContent(serviceDir) } - env.IMAGE_TAGS = writeJSON returnText: imageTags + // 构建镜像 + sh "docker build -t ${imageName} -t ${latestImageName} ${serviceDir}/." + imageTags[service] = imageName } + + env.IMAGE_TAGS = writeJSON returnText: imageTags } } }