Merge branch 'master' of https://gitea.nxsir.cn/nanxun/IM_NEW
This commit is contained in:
Vendored
+5
-5
@@ -94,7 +94,7 @@ def buildImage(serviceName, dockerfilePath) {
|
|||||||
def latestName = "${IMAGE_PREFIX}-${serviceName}:latest"
|
def latestName = "${IMAGE_PREFIX}-${serviceName}:latest"
|
||||||
|
|
||||||
sh """
|
sh """
|
||||||
docker build \
|
sudo docker build \
|
||||||
--pull \
|
--pull \
|
||||||
-t ${imageName} \
|
-t ${imageName} \
|
||||||
-t ${latestName} \
|
-t ${latestName} \
|
||||||
@@ -104,11 +104,11 @@ def buildImage(serviceName, dockerfilePath) {
|
|||||||
if (env.REGISTRY?.trim()) {
|
if (env.REGISTRY?.trim()) {
|
||||||
|
|
||||||
sh """
|
sh """
|
||||||
docker tag ${imageName} ${REGISTRY}/${serviceName}:${IMAGE_TAG}
|
sudo docker tag ${imageName} ${REGISTRY}/${serviceName}:${IMAGE_TAG}
|
||||||
docker tag ${latestName} ${REGISTRY}/${serviceName}:latest
|
sudo docker tag ${latestName} ${REGISTRY}/${serviceName}:latest
|
||||||
|
|
||||||
docker push ${REGISTRY}/${serviceName}:${IMAGE_TAG}
|
sudo docker push ${REGISTRY}/${serviceName}:${IMAGE_TAG}
|
||||||
docker push ${REGISTRY}/${serviceName}:latest
|
sudo docker push ${REGISTRY}/${serviceName}:latest
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user