Skip to content

Commit fe06ef4

Browse files
committed
cleaned up. still working?
1 parent fecc997 commit fe06ef4

File tree

1 file changed

+2
-38
lines changed

1 file changed

+2
-38
lines changed

Jenkinsfile

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -44,45 +44,9 @@ 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 '''
48-
echo "=== Docker Environment Debug ==="
49-
echo "DOCKER_HOST=$DOCKER_HOST"
50-
echo "DOCKER_TLS_VERIFY=$DOCKER_TLS_VERIFY"
51-
echo "DOCKER_CERT_PATH=$DOCKER_CERT_PATH"
52-
53-
echo "=== Creating Docker Context ==="
54-
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"
55-
56-
echo "=== Listing Docker Contexts ==="
57-
docker context ls
58-
59-
echo "=== Creating Buildx Builder ==="
60-
docker buildx create --name multiarch --driver docker-container --platform linux/amd64,linux/arm64 --use multiarch-context || docker buildx use multiarch
61-
62-
echo "=== Activating Builder ==="
63-
docker buildx use multiarch
64-
docker buildx inspect --bootstrap
65-
66-
echo "=== Listing Buildx Builders ==="
67-
docker buildx ls
68-
'''
47+
sh 'docker buildx create --name multiarch --driver docker-container --platform linux/amd64,linux/arm64 --use || docker buildx use multiarch'
6948
withMaven {
70-
sh """
71-
export DOCKER_TLS_VERIFY=1
72-
export DOCKER_CERT_PATH=/certs/client
73-
export DOCKER_CONFIG=\$HOME/.docker
74-
echo "=== Maven Environment Debug ==="
75-
echo "DOCKER_HOST=\$DOCKER_HOST"
76-
echo "DOCKER_TLS_VERIFY=\$DOCKER_TLS_VERIFY"
77-
echo "DOCKER_CERT_PATH=\$DOCKER_CERT_PATH"
78-
echo "DOCKER_CONFIG=\$DOCKER_CONFIG"
79-
echo "HOME=\$HOME"
80-
echo "=== Buildx Status for Maven ==="
81-
docker buildx ls
82-
echo "=== Checking builder files ==="
83-
ls -la \$HOME/.docker/buildx/instances/ || echo "No buildx instances directory"
84-
./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
85-
"""
49+
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"
8650
}
8751
}
8852
}

0 commit comments

Comments
 (0)