Merge branch 'master' of https://gitea.nxsir.cn/nanxun/IM_NEW
This commit is contained in:
Vendored
+9
-11
@@ -89,8 +89,8 @@ pipeline {
|
||||
}
|
||||
def buildImage(serviceName, dockerfilePath) {
|
||||
|
||||
def imageName = "${IMAGE_PREFIX}-${serviceName}:${IMAGE_TAG}"
|
||||
def latestName = "${IMAGE_PREFIX}-${serviceName}:latest"
|
||||
def imageName = "${env.IMAGE_PREFIX}-${serviceName}:${env.IMAGE_TAG}"
|
||||
def latestName = "${env.IMAGE_PREFIX}-${serviceName}:latest"
|
||||
|
||||
sh """
|
||||
sudo docker build \
|
||||
@@ -103,11 +103,14 @@ def buildImage(serviceName, dockerfilePath) {
|
||||
if (env.REGISTRY?.trim()) {
|
||||
|
||||
sh """
|
||||
sudo docker tag ${imageName} ${REGISTRY}/${serviceName}:${IMAGE_TAG}
|
||||
sudo docker tag ${latestName} ${REGISTRY}/${serviceName}:latest
|
||||
sudo docker tag ${imageName} ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG}
|
||||
sudo docker tag ${latestName} ${env.REGISTRY}/${serviceName}:latest
|
||||
|
||||
sudo docker push ${REGISTRY}/${serviceName}:${IMAGE_TAG}
|
||||
sudo docker push ${REGISTRY}/${serviceName}:latest
|
||||
sudo docker push ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG}
|
||||
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 ${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
|
||||
"""
|
||||
}
|
||||
Reference in New Issue
Block a user