Merge pull request #311 from jenkinsci/updatecli_0ff9cc33093f980d26812405c80fd1be3ee35c040c282120c73844ae601e5f26

dduportal · web-flow · commit 4d1d34e6dbe7 · 2022-11-29T09:49:07.000+01:00
Bump the parent image `jenkins/agent` version to 3077.vd69cf116da_6f-3
diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
@@ -21,10 +21,10 @@
 #  THE SOFTWARE.
 
 #TODO(oleg_nenashev): Does it also need an update?
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 FROM jenkins/agent:${version}-alpine-jdk11
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins
diff --git a/11/debian/Dockerfile b/11/debian/Dockerfile
@@ -20,10 +20,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 FROM jenkins/agent:${version}-jdk11
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins
diff --git a/11/windows/nanoserver-1809/Dockerfile b/11/windows/nanoserver-1809/Dockerfile
@@ -21,10 +21,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 FROM jenkins/agent:${version}-jdk11-nanoserver-1809
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"
 
 ARG user=jenkins
diff --git a/11/windows/windowsservercore-ltsc2019/Dockerfile b/11/windows/windowsservercore-ltsc2019/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 FROM jenkins/agent:${version}-jdk11-windowsservercore-ltsc2019
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"
diff --git a/17/alpine/Dockerfile b/17/alpine/Dockerfile
@@ -21,10 +21,10 @@
 #  THE SOFTWARE.
 
 #TODO(oleg_nenashev): Does it also need an update?
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 FROM jenkins/agent:${version}-alpine-jdk17
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins
diff --git a/17/debian/Dockerfile b/17/debian/Dockerfile
@@ -1,7 +1,7 @@
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 FROM jenkins/agent:${version}-jdk17
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins
diff --git a/17/windows/nanoserver-1809/Dockerfile b/17/windows/nanoserver-1809/Dockerfile
@@ -21,10 +21,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 FROM jenkins/agent:${version}-jdk17-nanoserver-1809
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"
 
 ARG user=jenkins
diff --git a/17/windows/windowsservercore-ltsc2019/Dockerfile b/17/windows/windowsservercore-ltsc2019/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=3077.vd69cf116da_6f-2
+ARG version=3077.vd69cf116da_6f-3
 FROM jenkins/agent:${version}-jdk17-windowsservercore-ltsc2019
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -25,7 +25,7 @@ variable "IMAGE_TAG" {
 
 #### This is for the "parent" image version to use (jenkins/agent:<PARENT_IMAGE_AGENT_VERSION>-<base-os>)
 variable "PARENT_IMAGE_VERSION" {
-  default = "3077.vd69cf116da_6f-2"
+  default = "3077.vd69cf116da_6f-3"
 }
 
 variable "REGISTRY" {
diff --git a/make.ps1 b/make.ps1
@@ -5,7 +5,7 @@ Param(
     [String] $AdditionalArgs = '',
     [String] $Build = '',
     [String] $VersionTag = '3071.v7e9b_0dc08466-1',
-    [String] $DockerAgentVersion = '3077.vd69cf116da_6f-2',
+    [String] $DockerAgentVersion = '3077.vd69cf116da_6f-3',
     [switch] $PushVersions = $false
 )
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ variable "IMAGE_TAG" {`
`25`	`25`
`26`	`26`	`#### This is for the "parent" image version to use (jenkins/agent:<PARENT_IMAGE_AGENT_VERSION>-<base-os>)`
`27`	`27`	`variable "PARENT_IMAGE_VERSION" {`
`28`		`- default = "3077.vd69cf116da_6f-2"`
	`28`	`+ default = "3077.vd69cf116da_6f-3"`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`variable "REGISTRY" {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ Param(`
`5`	`5`	`[String] $AdditionalArgs = '',`
`6`	`6`	`[String] $Build = '',`
`7`	`7`	`[String] $VersionTag = '3071.v7e9b_0dc08466-1',`
`8`		`- [String] $DockerAgentVersion = '3077.vd69cf116da_6f-2',`
	`8`	`+ [String] $DockerAgentVersion = '3077.vd69cf116da_6f-3',`
`9`	`9`	`[switch] $PushVersions = $false`
`10`	`10`	`)`
`11`	`11`