From 1552bfb5614b01d1c0f9ced8eb96ab34ef55baee Mon Sep 17 00:00:00 2001 From: XuqmGroup Date: Thu, 14 May 2026 15:37:24 +0800 Subject: [PATCH] fix: add --platform to docker pull and handle pull failure --- Jenkinsfile.ops-web | 2 +- Jenkinsfile.tenant-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.ops-web b/Jenkinsfile.ops-web index 7a01d84..bc7be6a 100644 --- a/Jenkinsfile.ops-web +++ b/Jenkinsfile.ops-web @@ -33,7 +33,7 @@ pipeline { def fullImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${params.IMAGE_TAG}" bat """ docker login ${env.ACR_REGISTRY} -u ${env.ACR_USERNAME} -p %ACR_PASS% - docker pull ${fullImage} || exit 0 + docker pull --platform=linux/amd64 ${fullImage} || echo Pull failed, will build fresh docker build --platform=linux/amd64 -f ${env.DOCKERFILE} ${env.BUILD_ARGS} --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${fullImage} -t ${fullImage} . docker push ${fullImage} docker rmi ${fullImage} || exit 0 diff --git a/Jenkinsfile.tenant-web b/Jenkinsfile.tenant-web index c791886..fa7b1b3 100644 --- a/Jenkinsfile.tenant-web +++ b/Jenkinsfile.tenant-web @@ -33,7 +33,7 @@ pipeline { def fullImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${params.IMAGE_TAG}" bat """ docker login ${env.ACR_REGISTRY} -u ${env.ACR_USERNAME} -p %ACR_PASS% - docker pull ${fullImage} || exit 0 + docker pull --platform=linux/amd64 ${fullImage} || echo Pull failed, will build fresh docker build --platform=linux/amd64 -f ${env.DOCKERFILE} ${env.BUILD_ARGS} --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${fullImage} -t ${fullImage} . docker push ${fullImage} docker rmi ${fullImage} || exit 0