From d1861b2ce2c0d78ebcd32a3b7c0d1bd4ea33f270 Mon Sep 17 00:00:00 2001 From: Michael Baumgartner Date: Sat, 14 Sep 2024 17:25:50 +0200 Subject: [PATCH] Adjust usages of jenkins-casc-config.yml --- docker/gitlab/gitlab-local-setup.sh | 2 +- docker/jenkins.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/gitlab/gitlab-local-setup.sh b/docker/gitlab/gitlab-local-setup.sh index 8a29ab818082..4e979c3ab2ea 100644 --- a/docker/gitlab/gitlab-local-setup.sh +++ b/docker/gitlab/gitlab-local-setup.sh @@ -47,7 +47,7 @@ artemis: " echo -echo 'The access Jenkins token has been created and can be copied into your jenkins-casc-config.yml file:' +echo 'The access Jenkins token has been created and can be copied into your jenkins-casc-config-gitlab.yml file:' echo " credentials: system: diff --git a/docker/jenkins.yml b/docker/jenkins.yml index 86b532593197..ca4f35492475 100644 --- a/docker/jenkins.yml +++ b/docker/jenkins.yml @@ -13,7 +13,7 @@ services: - artemis-jenkins-data:/var/jenkins_home - ./jenkins/jenkins-disable-csrf.groovy:/var/jenkins_home/init.groovy # Disable CSRF token - ./jenkins/master-key-only-for-testing.key:/var/jenkins_home/master.key # Preset master key to use pre-generated secrets - - ./jenkins/jenkins-casc-config.yml:/usr/share/jenkins/ref/jenkins-casc-config.yml:ro + - ./jenkins/jenkins-casc-config-gitlab.yml:/usr/share/jenkins/ref/jenkins-casc-config.yml:ro - /var/run/docker.sock:/var/run/docker.sock ports: - "8082:8080"