Skip to content

Commit 6ace503

Browse files
committed
trying again to clear vars
1 parent 7a26417 commit 6ace503

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

Jenkinsfile

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,14 @@ pipeline {
4545
usernamePassword(credentialsId: 'jenkins-central', usernameVariable: 'CENTRAL_USER', passwordVariable: 'CENTRAL_PASS'),
4646
string(credentialsId: 'jenkins-gpg', variable: 'GPG_PASS')]) {
4747
sh 'docker buildx create --name multiarch --use dind-context || docker buildx use multiarch'
48-
sh 'echo "DOCKER_HOST=$DOCKER_HOST"'
49-
sh 'echo "DOCKER_TLS_VERIFY=$DOCKER_TLS_VERIFY"'
50-
sh 'echo "DOCKER_CERT_PATH=$DOCKER_CERT_PATH"'
51-
sh 'echo "DOCKER_CONTEXT=$DOCKER_CONTEXT"'
52-
withEnv(['DOCKER_HOST=', 'DOCKER_TLS_VERIFY=', 'DOCKER_CERT_PATH=']) {
53-
sh 'echo "After withEnv - DOCKER_HOST=$DOCKER_HOST"'
54-
sh 'echo "After withEnv - DOCKER_TLS_VERIFY=$DOCKER_TLS_VERIFY"'
55-
sh 'echo "After withEnv - DOCKER_CERT_PATH=$DOCKER_CERT_PATH"'
56-
withMaven {
57-
sh "./jdk-wrapper.sh ./mvnw $target -P rpm -U -B -Dstyle.color=always -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Ddocker.verbose=true"
58-
}
48+
withMaven {
49+
sh """
50+
unset DOCKER_HOST DOCKER_TLS_VERIFY DOCKER_CERT_PATH
51+
echo "Cleared DOCKER_HOST=\$DOCKER_HOST"
52+
echo "Cleared DOCKER_TLS_VERIFY=\$DOCKER_TLS_VERIFY"
53+
echo "Cleared DOCKER_CERT_PATH=\$DOCKER_CERT_PATH"
54+
./jdk-wrapper.sh ./mvnw $target -P rpm -U -B -Dstyle.color=always -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Ddocker.verbose=true
55+
"""
5956
}
6057
}
6158
}

0 commit comments

Comments
 (0)