From 0263faeed23676fa6210c62b34db5b2fb0ba7ebf Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 5 Mar 2025 08:48:37 +0100 Subject: [PATCH 1/2] fix(Jenkinsfile): update Docker registry credentials handling in E2E stage --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f57678938..086c58362 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,6 @@ pipeline { } stage('E2E') { environment { - CREDENTIALS = credentials('docker-registry') COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}" COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ." } @@ -116,8 +115,10 @@ pipeline { script { sh 'rm junit/e2e-*.xml || true' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' + withDockerRegistry([credentialsId: 'docker-registry']) { + sh "docker-compose ${env.COMPOSE_PARAMS} up -d" + } def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') - sh "docker-compose ${env.COMPOSE_PARAMS} up -d" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") { sh 'cypress run --browser chromium || true' } -- 2.40.1 From 27149b17503be403269a7fc6b5220f6dee38526e Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 5 Mar 2025 08:51:57 +0100 Subject: [PATCH 2/2] fix(Jenkinsfile): enhance Docker registry credentials handling with dynamic URL --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 086c58362..e6647a654 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -115,7 +115,7 @@ pipeline { script { sh 'rm junit/e2e-*.xml || true' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' - withDockerRegistry([credentialsId: 'docker-registry']) { + withDockerRegistry([credentialsId: 'docker-registry', url: "https://${env.REGISTRY}" ]) { sh "docker-compose ${env.COMPOSE_PARAMS} up -d" } def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') -- 2.40.1