|
@@ -50,7 +50,6 @@ def pushOneHarborImage(def script, Map svc, String reg, String proj, String late
|
|
|
def withLibFlag = svc.withLib ? 'true' : 'false'
|
|
def withLibFlag = svc.withLib ? 'true' : 'false'
|
|
|
script.sh """
|
|
script.sh """
|
|
|
set -e
|
|
set -e
|
|
|
- export DOCKER_BUILDKIT=1
|
|
|
|
|
test -f ${workspace}/${svc.module}/target/${jarName}
|
|
test -f ${workspace}/${svc.module}/target/${jarName}
|
|
|
cd ${workspace}/${svc.module}
|
|
cd ${workspace}/${svc.module}
|
|
|
rm -rf .jenkins_docker_ctx && mkdir -p .jenkins_docker_ctx/lib
|
|
rm -rf .jenkins_docker_ctx && mkdir -p .jenkins_docker_ctx/lib
|
|
@@ -65,6 +64,7 @@ def pushOneHarborImage(def script, Map svc, String reg, String proj, String late
|
|
|
echo ">>> archive previous ${latestTag} -> ${buildTag}"
|
|
echo ">>> archive previous ${latestTag} -> ${buildTag}"
|
|
|
docker tag ${imageLatest} ${imageBuild}
|
|
docker tag ${imageLatest} ${imageBuild}
|
|
|
docker push ${imageBuild}
|
|
docker push ${imageBuild}
|
|
|
|
|
+ docker rmi ${imageBuild} ${imageLatest} 2>/dev/null || true
|
|
|
fi
|
|
fi
|
|
|
docker build -f ${workspace}/${dockerfile} \\
|
|
docker build -f ${workspace}/${dockerfile} \\
|
|
|
--build-arg BASE_IMAGE=${baseImage} \\
|
|
--build-arg BASE_IMAGE=${baseImage} \\
|
|
@@ -75,6 +75,7 @@ def pushOneHarborImage(def script, Map svc, String reg, String proj, String late
|
|
|
docker push ${imageLatest}
|
|
docker push ${imageLatest}
|
|
|
echo ">>> pushed ${imageLatest} (archived prior latest as ${buildTag} if any)"
|
|
echo ">>> pushed ${imageLatest} (archived prior latest as ${buildTag} if any)"
|
|
|
docker rmi ${imageLatest} 2>/dev/null || true
|
|
docker rmi ${imageLatest} 2>/dev/null || true
|
|
|
|
|
+ docker image prune -f 2>/dev/null || true
|
|
|
cd ${workspace}/${svc.module}
|
|
cd ${workspace}/${svc.module}
|
|
|
rm -rf .jenkins_docker_ctx
|
|
rm -rf .jenkins_docker_ctx
|
|
|
"""
|
|
"""
|
|
@@ -384,7 +385,7 @@ pipeline {
|
|
|
echo "\${HARBOR_PASS}" | docker login ${reg} -u "\${HARBOR_USER}" --password-stdin
|
|
echo "\${HARBOR_PASS}" | docker login ${reg} -u "\${HARBOR_USER}" --password-stdin
|
|
|
echo ">>> docker disk before Harbor push:"
|
|
echo ">>> docker disk before Harbor push:"
|
|
|
df -h /var/lib/docker 2>/dev/null || df -h / || true
|
|
df -h /var/lib/docker 2>/dev/null || df -h / || true
|
|
|
- docker system prune -f --filter until=48h 2>/dev/null || true
|
|
|
|
|
|
|
+ docker image prune -f 2>/dev/null || true
|
|
|
"""
|
|
"""
|
|
|
if (params.HARBOR_PUSH_PARALLEL) {
|
|
if (params.HARBOR_PUSH_PARALLEL) {
|
|
|
def pushBranches = [:]
|
|
def pushBranches = [:]
|
|
@@ -406,6 +407,11 @@ pipeline {
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ sh """
|
|
|
|
|
+ echo ">>> docker disk after Harbor push:"
|
|
|
|
|
+ df -h /var/lib/docker 2>/dev/null || df -h / || true
|
|
|
|
|
+ docker image prune -f 2>/dev/null || true
|
|
|
|
|
+ """
|
|
|
if (params.HARBOR_PRUNE_OLD_TAGS == true) {
|
|
if (params.HARBOR_PRUNE_OLD_TAGS == true) {
|
|
|
def keepN = (params.HARBOR_KEEP_TAG_COUNT ?: '10').trim() as int
|
|
def keepN = (params.HARBOR_KEEP_TAG_COUNT ?: '10').trim() as int
|
|
|
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
|
|
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
|