diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index d732606d..d1a217d8 100644 --- 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=3071.v7e9b_0dc08466-1 +ARG version=3071.v7e9b_0dc08466-5 FROM jenkins/agent:${version}-alpine-jdk11 -ARG version +ARG version=3071.v7e9b_0dc08466-5 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 index 94a96d13..e1d88d37 100644 --- 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=3071.v7e9b_0dc08466-1 +ARG version=3071.v7e9b_0dc08466-5 FROM jenkins/agent:${version}-jdk11 -ARG version +ARG version=3071.v7e9b_0dc08466-5 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 index a2aae40c..e02f3118 100644 --- 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=3071.v7e9b_0dc08466-1 +ARG version=3071.v7e9b_0dc08466-5 FROM jenkins/agent:${version}-jdk11-nanoserver-1809 -ARG version +ARG version=3071.v7e9b_0dc08466-5 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 index eb6475fc..43349f6f 100644 --- 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=3071.v7e9b_0dc08466-1 +ARG version=3071.v7e9b_0dc08466-5 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 index 8788b228..65b8505c 100644 --- 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=3071.v7e9b_0dc08466-1 +ARG version=3071.v7e9b_0dc08466-5 FROM jenkins/agent:${version}-alpine-jdk17 -ARG version +ARG version=3071.v7e9b_0dc08466-5 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 index 787c7256..04d971f4 100644 --- a/17/debian/Dockerfile +++ b/17/debian/Dockerfile @@ -1,7 +1,7 @@ -ARG version=3071.v7e9b_0dc08466-1 +ARG version=3071.v7e9b_0dc08466-5 FROM jenkins/agent:${version}-jdk17 -ARG version +ARG version=3071.v7e9b_0dc08466-5 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 index f5e68ebf..b991da24 100644 --- 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=3071.v7e9b_0dc08466-1 +ARG version=3071.v7e9b_0dc08466-5 FROM jenkins/agent:${version}-jdk17-nanoserver-1809 -ARG version +ARG version=3071.v7e9b_0dc08466-5 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 index ffcc0e9d..f2141290 100644 --- 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=3071.v7e9b_0dc08466-1 +ARG version=3071.v7e9b_0dc08466-5 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 index c74c2770..7439907e 100644 --- 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:-) variable "PARENT_IMAGE_VERSION" { - default = "3071.v7e9b_0dc08466-1" + default = "3071.v7e9b_0dc08466-5" } variable "REGISTRY" { diff --git a/make.ps1 b/make.ps1 index 5ed030b0..89cb4901 100644 --- a/make.ps1 +++ b/make.ps1 @@ -5,7 +5,7 @@ Param( [String] $AdditionalArgs = '', [String] $Build = '', [String] $VersionTag = '3071.v7e9b_0dc08466-1', - [String] $DockerAgentVersion = '3071.v7e9b_0dc08466-1', + [String] $DockerAgentVersion = '3071.v7e9b_0dc08466-5', [switch] $PushVersions = $false )