From d7b576ed9b42701442ba137915b93bf1049bc4c2 Mon Sep 17 00:00:00 2001
From: Nicholas Mucks <njmuck@dolby.net>
Date: Sun, 21 Jul 2024 17:23:55 -0700
Subject: [PATCH] configure jenkins not to use welcome screen

---
 jenkins.yaml         | 68 ++++++++++++++++++++++----------------------
 spring-petclinic.yml |  3 ++
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/jenkins.yaml b/jenkins.yaml
index b32ef4b9c..80453548e 100644
--- a/jenkins.yaml
+++ b/jenkins.yaml
@@ -5,43 +5,43 @@ jenkins:
       allowsSignup: false
       users:
         - id: "admin"
-          password: "admin"
+          password: "${JENKINS_ADMIN_PASSWORD:-admin}"
   authorizationStrategy:
     loggedInUsersCanDoAnything:
-      allowAnonymousRead: true
+      allowAnonymousRead: false
 
 unclassified:
   location:
     url: "http://localhost:8080/"
-  prometheus:
-    defaultQuantiles:
-      - name: "0.5"
-        value: 0.5
-      - name: "0.9"
-        value: 0.9
-      - name: "0.99"
-        value: 0.99
-    defaultBuckets:
-      - name: "0.1"
-        value: 0.1
-      - name: "0.2"
-        value: 0.2
-      - name: "0.5"
-        value: 0.5
-      - name: "1.0"
-        value: 1.0
-      - name: "2.5"
-        value: 2.5
-      - name: "5.0"
-        value: 5.0
-      - name: "10.0"
-        value: 10.0
-
-tools:
-  installations:
-    - name: "JDK11"
-      jdkInstaller:
-        id: "jdk-11.0.2+9"
-    - name: "Maven3"
-      mavenInstaller:
-        id: "maven-3.6.3"
+#  prometheus:
+#    defaultQuantiles:
+#      - name: "0.5"
+#        value: 0.5
+#      - name: "0.9"
+#        value: 0.9
+#      - name: "0.99"
+#        value: 0.99
+#    defaultBuckets:
+#      - name: "0.1"
+#        value: 0.1
+#      - name: "0.2"
+#        value: 0.2
+#      - name: "0.5"
+#        value: 0.5
+#      - name: "1.0"
+#        value: 1.0
+#      - name: "2.5"
+#        value: 2.5
+#      - name: "5.0"
+#        value: 5.0
+#      - name: "10.0"
+#        value: 10.0
+#
+#tools:
+#  installations:
+#    - name: "JDK11"
+#      jdkInstaller:
+#        id: "jdk-11.0.2+9"
+#    - name: "Maven3"
+#      mavenInstaller:
+#        id: "maven-3.6.3"
diff --git a/spring-petclinic.yml b/spring-petclinic.yml
index 4356a52d9..9774a1719 100644
--- a/spring-petclinic.yml
+++ b/spring-petclinic.yml
@@ -42,6 +42,9 @@ services:
       - "50000:50000"
     privileged: true
     user: root
+    environment:
+      - JAVA_OPTS=-Djenkins.install.runSetupWizard=false
+      - CASC_JENKINS_CONFIG=/var/jenkins_home/casc_configs/jenkins.yaml
     volumes:
       - jenkins_data:/var/jenkins_home
       - ./jenkins.yaml:/var/jenkins_home/casc_configs/jenkins.yaml