|
|
@@ -267,18 +267,22 @@ pipeline {
|
|
|
sh """
|
|
|
set -e
|
|
|
echo "\${HARBOR_PASS}" | docker login ${reg} -u "\${HARBOR_USER}" --password-stdin
|
|
|
+ echo ">>> docker disk before Harbor push:"
|
|
|
+ df -h /var/lib/docker 2>/dev/null || df -h / || true
|
|
|
+ docker system prune -f --filter until=48h 2>/dev/null || true
|
|
|
"""
|
|
|
harborServices.each { svc ->
|
|
|
def jarName = "${svc.module}-1.0.0.jar"
|
|
|
def imageLatest = "${reg}/${proj}/${svc.repo}:${latestTag}"
|
|
|
def imageBuild = "${reg}/${proj}/${svc.repo}:${buildTag}"
|
|
|
+ def withLibFlag = svc.withLib ? 'true' : 'false'
|
|
|
sh """
|
|
|
set -e
|
|
|
test -f ${WORKSPACE}/${svc.module}/target/${jarName}
|
|
|
cd ${WORKSPACE}/${svc.module}
|
|
|
rm -rf .jenkins_docker_ctx && mkdir -p .jenkins_docker_ctx/lib
|
|
|
cp -f target/${jarName} .jenkins_docker_ctx/${jarName}
|
|
|
- if [ -d target/lib ]; then
|
|
|
+ if [ "${withLibFlag}" = "true" ] && [ -d target/lib ]; then
|
|
|
cp -rf target/lib/. .jenkins_docker_ctx/lib/
|
|
|
else
|
|
|
touch .jenkins_docker_ctx/lib/.keep
|
|
|
@@ -297,6 +301,9 @@ pipeline {
|
|
|
-t ${imageLatest} .
|
|
|
docker push ${imageLatest}
|
|
|
echo ">>> pushed ${imageLatest} (archived prior latest as ${buildTag} if any)"
|
|
|
+ docker rmi ${imageLatest} 2>/dev/null || true
|
|
|
+ cd ${WORKSPACE}/${svc.module}
|
|
|
+ rm -rf .jenkins_docker_ctx
|
|
|
"""
|
|
|
}
|
|
|
if (params.HARBOR_PRUNE_OLD_TAGS == true) {
|