diff --git a/Jenkinsfile b/Jenkinsfile index 6bc20c8..2355188 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,13 +8,10 @@ pipeline { steps { script { withCredentials([ - usernamePassword(credentialsId: 'jenkins-artifactory', usernameVariable: 'ARTIFACTORY_USER', passwordVariable: 'ARTIFACTORY_PASS'), file(credentialsId: 'google-artifactory-dev-write', variable: 'GAR_WR_SECRET') ]) { sh '''#!/bin/bash set -euo pipefail - echo "Logging into Artifactory" - docker login docker.internal.sysdig.com -u="$ARTIFACTORY_USER" -p="$ARTIFACTORY_PASS" echo "Logging into GAR dev" cat $GAR_WR_SECRET | docker login --username _json_key --password-stdin us-docker.pkg.dev/sysdig-artifact-registry-dev/gar-docker ''' @@ -32,13 +29,10 @@ pipeline { userRemoteConfigs: [[credentialsId: 'github-jenkins-user-token', url: 'https://github.com/draios/linux-bench.git']] ]) script { - docker.withRegistry("https://docker.internal.sysdig.com", 'jenkins-artifactory') { - sh "IMAGE_TAG=${params.TAG} PUSH=yes make -f makefile-sysdig build-dependency-image" - sh "IMAGE_TAG=${params.TAG} PUSH=yes make -f makefile-sysdig build-dependency-image-gar" - } - } + sh "IMAGE_TAG=${params.TAG} PUSH=yes make -f makefile-sysdig build-dependency-image-gar" } } } + } }