Merge pull request #405 from jenkinsci/updatecli_195d1a9c46d180ae2d6b…

…7748d12487c65c55751d62ad3fb6aa1a7dd9826ddc4e

Bump the parent image `jenkins/agent` version to 3148.v532a_7e715ee3-5

alpine/Dockerfile

@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3148.v532a_7e715ee3-4
+ARG version=3148.v532a_7e715ee3-5
 ARG JAVA_MAJOR_VERSION=17
 FROM jenkins/agent:"${version}"-alpine-jdk"${JAVA_MAJOR_VERSION}"
 

alpine/Dockerfile-jdk21

@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3148.v532a_7e715ee3-1
+ARG version=3148.v532a_7e715ee3-5
 ARG JAVA_MAJOR_VERSION=21
 FROM jenkins/agent:"${version}"-alpine-jdk"${JAVA_MAJOR_VERSION}"-preview
 

build.ps1

@@ -4,7 +4,7 @@ Param(
     [String] $Target = "build",
     [String] $Build = '',
     [String] $VersionTag = 'NEXT_TAG_VERSION',
-    [String] $ParentImageVersion = '3148.v532a_7e715ee3-4',
+    [String] $ParentImageVersion = '3148.v532a_7e715ee3-5',
     [switch] $PushVersions = $false
 )
 

debian/Dockerfile

@@ -1,4 +1,4 @@
-ARG version=3148.v532a_7e715ee3-4
+ARG version=3148.v532a_7e715ee3-5
 ARG JAVA_MAJOR_VERSION=17
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"
 

debian/Dockerfile-jdk21

@@ -1,4 +1,4 @@
-ARG version=3148.v532a_7e715ee3-1
+ARG version=3148.v532a_7e715ee3-5
 ARG JAVA_MAJOR_VERSION=21
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}-preview"
 

docker-bake.hcl

@@ -36,7 +36,7 @@ variable "IMAGE_TAG" {
 
 #### This is for the "parent" image version to use (jenkins/agent:<PARENT_IMAGE_VERSION>-<base-os>)
 variable "PARENT_IMAGE_VERSION" {
-  default = "3148.v532a_7e715ee3-4"
+  default = "3148.v532a_7e715ee3-5"
 }
 
 variable "REGISTRY" {
@@ -53,14 +53,14 @@ variable "ON_TAG" {
 
 target "alpine_jdk11" {
   dockerfile = "alpine/Dockerfile"
-  context = "."
+  context    = "."
   args = {
     JAVA_MAJOR_VERSION = "11"
-    version = "${PARENT_IMAGE_VERSION}"
+    version            = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine": "",
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk11": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine" : "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk11" : "",
     "${REGISTRY}/${JENKINS_REPO}:alpine",
     "${REGISTRY}/${JENKINS_REPO}:alpine-jdk11",
     "${REGISTRY}/${JENKINS_REPO}:latest-alpine",
@@ -71,13 +71,13 @@ target "alpine_jdk11" {
 
 target "alpine_jdk17" {
   dockerfile = "alpine/Dockerfile"
-  context = "."
+  context    = "."
   args = {
     JAVA_MAJOR_VERSION = "17"
-    version = "${PARENT_IMAGE_VERSION}"
+    version            = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk17": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk17" : "",
     "${REGISTRY}/${JENKINS_REPO}:alpine-jdk17",
     "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk17",
   ]
@@ -86,13 +86,13 @@ target "alpine_jdk17" {
 
 target "alpine_jdk21" {
   dockerfile = "alpine/Dockerfile-jdk21"
-  context = "."
+  context    = "."
   args = {
     JAVA_MAJOR_VERSION = "21"
-    version = "${PARENT_IMAGE_VERSION}"
+    version            = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk21-preview": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk21-preview" : "",
     "${REGISTRY}/${JENKINS_REPO}:alpine-jdk21-preview",
     "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk21-preview",
   ]
@@ -101,14 +101,14 @@ target "alpine_jdk21" {
 
 target "debian_jdk11" {
   dockerfile = "debian/Dockerfile"
-  context = "."
+  context    = "."
   args = {
     JAVA_MAJOR_VERSION = "11"
-    version = "${PARENT_IMAGE_VERSION}"
+    version            = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}": "",
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk11": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}" : "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk11" : "",
     "${REGISTRY}/${JENKINS_REPO}:jdk11",
     "${REGISTRY}/${JENKINS_REPO}:latest",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk11",
@@ -118,13 +118,13 @@ target "debian_jdk11" {
 
 target "debian_jdk17" {
   dockerfile = "debian/Dockerfile"
-  context = "."
+  context    = "."
   args = {
     JAVA_MAJOR_VERSION = "17"
-    version = "${PARENT_IMAGE_VERSION}"
+    version            = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk17": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk17" : "",
     "${REGISTRY}/${JENKINS_REPO}:jdk17",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk17",
   ]
@@ -133,13 +133,13 @@ target "debian_jdk17" {
 
 target "debian_jdk21" {
   dockerfile = "debian/Dockerfile-jdk21"
-  context = "."
+  context    = "."
   args = {
     JAVA_MAJOR_VERSION = "21"
-    version = "${PARENT_IMAGE_VERSION}"
+    version            = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk21-preview": "",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk21-preview" : "",
     "${REGISTRY}/${JENKINS_REPO}:jdk21-preview",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview",
   ]

windows/nanoserver/Dockerfile

@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3148.v532a_7e715ee3-4
+ARG version=3148.v532a_7e715ee3-5
 ARG JAVA_MAJOR_VERSION=17
 ARG WINDOWS_VERSION_TAG=1809
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-nanoserver-"${WINDOWS_VERSION_TAG}"

windows/windowsservercore/Dockerfile

@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3148.v532a_7e715ee3-4
+ARG version=3148.v532a_7e715ee3-5
 ARG JAVA_MAJOR_VERSION=17
 ARG WINDOWS_VERSION_TAG=ltsc2019
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-windowsservercore-"${WINDOWS_VERSION_TAG}"