Skip to content

Commit a5faed1

Browse files
committed
try again
1 parent fb0a08f commit a5faed1

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

Jenkinsfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,17 @@ pipeline {
4545
usernamePassword(credentialsId: 'jenkins-central', usernameVariable: 'CENTRAL_USER', passwordVariable: 'CENTRAL_PASS'),
4646
string(credentialsId: 'jenkins-gpg', variable: 'GPG_PASS')]) {
4747
sh '''
48-
# Create buildx context using current Docker environment
49-
docker buildx create --name multiarch --driver docker-container --use || docker buildx use multiarch
48+
# First create a Docker context with current environment settings
49+
docker context create multiarch-context --docker "host=$DOCKER_HOST,ca=/certs/client/ca.pem,cert=/certs/client/cert.pem,key=/certs/client/key.pem" || echo "Context may already exist"
50+
# Create buildx builder using the custom context
51+
docker buildx create --name multiarch --driver docker-container --use multiarch-context || docker buildx use multiarch
5052
'''
5153
withMaven {
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"
54+
sh """
55+
unset DOCKER_TLS_VERIFY DOCKER_CERT_PATH
56+
echo "Cleared TLS env vars, keeping DOCKER_HOST=\$DOCKER_HOST"
57+
./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+
"""
5359
}
5460
}
5561
}

0 commit comments

Comments
 (0)