From d38f9444c4feaf339c712a1546c35e59697e7131 Mon Sep 17 00:00:00 2001 From: Vojtech Juranek Date: Wed, 22 Mar 2023 14:40:11 +0100 Subject: [PATCH] DBZ-6216 Remove Docker credential Remove docker credentials and login to docker hub from scripts and jobs. As this is in separate commit, it can be easily reverted in case we want to publish to docker hub again in the future. --- jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy | 3 --- .../pipelines/build_debezium_images_pipeline.groovy | 6 ------ .../pipelines/build_debezium_tool_images_pipeline.groovy | 6 ------ jenkins-jobs/scripts/trigger-nightly-docker.sh | 1 - 4 files changed, 16 deletions(-) diff --git a/jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy b/jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy index 885b51376..8c30d53c3 100644 --- a/jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy +++ b/jenkins-jobs/job-dsl/release_debezium_nightly_image.groovy @@ -19,9 +19,6 @@ freeStyleJob('release-debezium-nightly-image') { timeout { noActivity(600) } - credentialsBinding { - usernamePassword('DOCKER_USERNAME', 'DOCKER_PASSWORD', 'debezium-dockerhub') - } credentialsBinding { string('QUAYIO_CREDENTIALS', 'debezium-quay') } diff --git a/jenkins-jobs/pipelines/build_debezium_images_pipeline.groovy b/jenkins-jobs/pipelines/build_debezium_images_pipeline.groovy index cb30246f7..141d86aa4 100644 --- a/jenkins-jobs/pipelines/build_debezium_images_pipeline.groovy +++ b/jenkins-jobs/pipelines/build_debezium_images_pipeline.groovy @@ -7,7 +7,6 @@ TAG_REST_ENDPOINT = "https://api.github.com/repos/${params.DEBEZIUM_REPOSITORY}/ STREAMS_TO_BUILD_COUNT = params.STREAMS_TO_BUILD_COUNT.toInteger() TAGS_PER_STREAM_COUNT = params.TAGS_PER_STREAM_COUNT.toInteger() GIT_CREDENTIALS_ID = 'debezium-github' -DOCKER_CREDENTIALS_ID = 'debezium-dockerhub' QUAYIO_CREDENTIALS_ID = 'debezium-quay' class Version implements Comparable { @@ -154,11 +153,6 @@ node('Slave') { withCredentials([usernamePassword(credentialsId: GIT_CREDENTIALS_ID, passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) { initVersions(GIT_USERNAME, GIT_PASSWORD) } - withCredentials([usernamePassword(credentialsId: DOCKER_CREDENTIALS_ID, passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME')]) { - sh """ - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - """ - } withCredentials([string(credentialsId: QUAYIO_CREDENTIALS_ID, variable: 'USERNAME_PASSWORD')]) { def credentials = USERNAME_PASSWORD.split(':') sh """ diff --git a/jenkins-jobs/pipelines/build_debezium_tool_images_pipeline.groovy b/jenkins-jobs/pipelines/build_debezium_tool_images_pipeline.groovy index bbcd6aba4..8537aa3b0 100644 --- a/jenkins-jobs/pipelines/build_debezium_tool_images_pipeline.groovy +++ b/jenkins-jobs/pipelines/build_debezium_tool_images_pipeline.groovy @@ -3,7 +3,6 @@ import java.util.* IMAGES_DIR = 'images' GIT_CREDENTIALS_ID = 'debezium-github' -DOCKER_CREDENTIALS_ID = 'debezium-dockerhub' QUAYIO_CREDENTIALS_ID = 'debezium-quay' node('Slave') { @@ -20,11 +19,6 @@ node('Slave') { userRemoteConfigs : [[url: "https://$params.IMAGES_REPOSITORY", credentialsId: GIT_CREDENTIALS_ID]] ] ) - withCredentials([usernamePassword(credentialsId: DOCKER_CREDENTIALS_ID, passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME')]) { - sh """ - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - """ - } withCredentials([string(credentialsId: QUAYIO_CREDENTIALS_ID, variable: 'USERNAME_PASSWORD')]) { def credentials = USERNAME_PASSWORD.split(':') sh """ diff --git a/jenkins-jobs/scripts/trigger-nightly-docker.sh b/jenkins-jobs/scripts/trigger-nightly-docker.sh index a8bc63c25..7af032ce2 100644 --- a/jenkins-jobs/scripts/trigger-nightly-docker.sh +++ b/jenkins-jobs/scripts/trigger-nightly-docker.sh @@ -5,7 +5,6 @@ DEBEZIUM_BRANCH=main SNAPSHOT_VERSION=$(curl -s https://raw.githubusercontent.com/$DEBEZIUM_REPOSITORY/$DEBEZIUM_BRANCH/pom.xml | grep -o '.*-SNAPSHOT' | awk -F '[<>]' '{print $3}') -docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker login -u ${QUAYIO_CREDENTIALS%:*} -p ${QUAYIO_CREDENTIALS#*:} quay.io docker build --build-arg DEBEZIUM_VERSION=$SNAPSHOT_VERSION -t quay.io/debezium/connect:nightly connect/snapshot docker push quay.io/debezium/connect:nightly