Merge remote-tracking branch 'upstream/master' into lts

Author: MarkEWaite

README.md

@@ -184,6 +184,8 @@ FROM jenkins/jenkins:lts-jdk17
 COPY --chown=jenkins:jenkins custom.groovy /usr/share/jenkins/ref/init.groovy.d/custom.groovy
 ```
 
+If you need to maintain the entire init.groovy.d directory and have a persistent JENKINS_HOME you may run the docker image with `-e PRE_CLEAR_INIT_GROOVY_D=true`
+
 ## Preinstalling plugins
 
 ### Install plugins

build-windows.yaml

@@ -14,8 +14,6 @@ services:
         WINDOWS_VERSION: ${WINDOWS_VERSION}
       tags:
         - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk17-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
   jdk21:
     image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
     build:

docker-bake.hcl

@@ -134,14 +134,10 @@ target "alpine_jdk17" {
     JAVA_VERSION       = JAVA17_VERSION
   }
   tags = [
-    tag(true, "alpine"),
     tag(true, "alpine-jdk17"),
-    tag_weekly(false, "alpine"),
     tag_weekly(false, "alpine-jdk17"),
     tag_weekly(false, "alpine${ALPINE_SHORT_TAG}-jdk17"),
-    tag_lts(false, "lts-alpine"),
     tag_lts(false, "lts-alpine-jdk17"),
-    tag_lts(true, "lts-alpine")
   ]
   platforms = ["linux/amd64"]
 }
@@ -158,10 +154,14 @@ target "alpine_jdk21" {
     JAVA_VERSION       = JAVA21_VERSION
   }
   tags = [
+    tag(true, "alpine"),
     tag(true, "alpine-jdk21"),
+    tag_weekly(false, "alpine"),
     tag_weekly(false, "alpine-jdk21"),
     tag_weekly(false, "alpine${ALPINE_SHORT_TAG}-jdk21"),
-    tag_lts(false, "lts-alpine-jdk21")
+    tag_lts(false, "lts-alpine"),
+    tag_lts(false, "lts-alpine-jdk21"),
+    tag_lts(true, "lts-alpine"),
   ]
   platforms = ["linux/amd64", "linux/arm64"]
 }
@@ -178,14 +178,10 @@ target "debian_jdk17" {
     JAVA_VERSION       = JAVA17_VERSION
   }
   tags = [
-    tag(true, ""),
     tag(true, "jdk17"),
-    tag_weekly(false, "latest"),
     tag_weekly(false, "latest-jdk17"),
     tag_weekly(false, "jdk17"),
-    tag_lts(false, "lts"),
     tag_lts(false, "lts-jdk17"),
-    tag_lts(true, "lts"),
     tag_lts(true, "lts-jdk17")
   ]
   platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"]
@@ -203,10 +199,14 @@ target "debian_jdk21" {
     JAVA_VERSION       = JAVA21_VERSION
   }
   tags = [
+    tag(true, ""),
     tag(true, "jdk21"),
+    tag_weekly(false, "latest"),
     tag_weekly(false, "latest-jdk21"),
     tag_weekly(false, "jdk21"),
+    tag_lts(false, "lts"),
     tag_lts(false, "lts-jdk21"),
+    tag_lts(true, "lts"),
     tag_lts(true, "lts-jdk21")
   ]
   platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"]
@@ -224,13 +224,9 @@ target "debian_slim_jdk17" {
     JAVA_VERSION       = JAVA17_VERSION
   }
   tags = [
-    tag(true, "slim"),
     tag(true, "slim-jdk17"),
-    tag_weekly(false, "slim"),
     tag_weekly(false, "slim-jdk17"),
-    tag_lts(false, "lts-slim"),
     tag_lts(false, "lts-slim-jdk17"),
-    tag_lts(true, "lts-slim"),
   ]
   platforms = ["linux/amd64"]
 }
@@ -247,9 +243,13 @@ target "debian_slim_jdk21" {
     JAVA_VERSION       = JAVA21_VERSION
   }
   tags = [
+    tag(true, "slim"),
     tag(true, "slim-jdk21"),
+    tag_weekly(false, "slim"),
     tag_weekly(false, "slim-jdk21"),
+    tag_lts(false, "lts-slim"),
     tag_lts(false, "lts-slim-jdk21"),
+    tag_lts(true, "lts-slim"),
   ]
   platforms = ["linux/amd64", "linux/arm64"]
 }

jenkins.sh

@@ -2,6 +2,11 @@
 
 : "${JENKINS_WAR:="/usr/share/jenkins/jenkins.war"}"
 : "${JENKINS_HOME:="/var/jenkins_home"}"
+
+if [[ -n "${PRE_CLEAR_INIT_GROOVY_D}" ]]; then
+  rm -rf "${JENKINS_HOME}/init.groovy.d"
+fi
+
 : "${COPY_REFERENCE_FILE_LOG:="${JENKINS_HOME}/copy_reference_file.log"}"
 : "${REF:="/usr/share/jenkins/ref"}"