This commit is contained in:
2026-05-09 19:54:27 +08:00
Vendored
+9 -11
View File
@@ -89,8 +89,8 @@ pipeline {
} }
def buildImage(serviceName, dockerfilePath) { def buildImage(serviceName, dockerfilePath) {
def imageName = "${IMAGE_PREFIX}-${serviceName}:${IMAGE_TAG}" def imageName = "${env.IMAGE_PREFIX}-${serviceName}:${env.IMAGE_TAG}"
def latestName = "${IMAGE_PREFIX}-${serviceName}:latest" def latestName = "${env.IMAGE_PREFIX}-${serviceName}:latest"
sh """ sh """
sudo docker build \ sudo docker build \
@@ -103,11 +103,14 @@ def buildImage(serviceName, dockerfilePath) {
if (env.REGISTRY?.trim()) { if (env.REGISTRY?.trim()) {
sh """ sh """
sudo docker tag ${imageName} ${REGISTRY}/${serviceName}:${IMAGE_TAG} sudo docker tag ${imageName} ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG}
sudo docker tag ${latestName} ${REGISTRY}/${serviceName}:latest sudo docker tag ${latestName} ${env.REGISTRY}/${serviceName}:latest
sudo docker push ${REGISTRY}/${serviceName}:${IMAGE_TAG} sudo docker push ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG}
sudo docker push ${REGISTRY}/${serviceName}:latest sudo docker push ${env.REGISTRY}/${serviceName}:latest
sudo docker rmi ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} || true
sudo docker rmi ${env.REGISTRY}/${serviceName}:latest || true
""" """
} }
@@ -115,11 +118,6 @@ def buildImage(serviceName, dockerfilePath) {
sudo docker rmi ${imageName} || true sudo docker rmi ${imageName} || true
sudo docker rmi ${latestName} || true sudo docker rmi ${latestName} || true
if [ -n "${REGISTRY}" ]; then
sudo docker rmi ${REGISTRY}/${serviceName}:${IMAGE_TAG} || true
sudo docker rmi ${REGISTRY}/${serviceName}:latest || true
fi
sudo docker builder prune -f || true sudo docker builder prune -f || true
""" """
} }