Skip to content

Commit fb0a08f

Browse files
committed
trying again
1 parent 6ace503 commit fb0a08f

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

Jenkinsfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,12 @@ pipeline {
4444
withCredentials([usernamePassword(credentialsId: 'jenkins-dockerhub', usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD'),
4545
usernamePassword(credentialsId: 'jenkins-central', usernameVariable: 'CENTRAL_USER', passwordVariable: 'CENTRAL_PASS'),
4646
string(credentialsId: 'jenkins-gpg', variable: 'GPG_PASS')]) {
47-
sh 'docker buildx create --name multiarch --use dind-context || docker buildx use multiarch'
47+
sh '''
48+
# Create buildx context using current Docker environment
49+
docker buildx create --name multiarch --driver docker-container --use || docker buildx use multiarch
50+
'''
4851
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-
"""
52+
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"
5653
}
5754
}
5855
}

0 commit comments

Comments
 (0)