Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

Commit

Permalink
Merge pull request #359 from jenkinsci/updatecli_e2de7eb85c43780689e9…
Browse files Browse the repository at this point in the history
…eeb60ba0251d34f2fa8f315ab68e8e6be62ca5724478

Bump the parent image `jenkins/agent` version to 3131.vf2b_b_798b_ce99-2
  • Loading branch information
dduportal authored Jun 26, 2023
2 parents e6c5545 + dc1f531 commit 879fb0c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
# THE SOFTWARE.

#TODO(oleg_nenashev): Does it also need an update?
ARG version=3131.vf2b_b_798b_ce99-1
ARG version=3131.vf2b_b_798b_ce99-2
ARG JAVA_MAJOR_VERSION=17
FROM jenkins/agent:"${version}"-alpine-jdk"${JAVA_MAJOR_VERSION}"

ARG version=3131.vf2b_b_798b_ce99-1
ARG version=3131.vf2b_b_798b_ce99-2
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

ARG user=jenkins
Expand Down
4 changes: 2 additions & 2 deletions debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG version=3131.vf2b_b_798b_ce99-1
ARG version=3131.vf2b_b_798b_ce99-2
ARG JAVA_MAJOR_VERSION=17
FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"

ARG version=3131.vf2b_b_798b_ce99-1
ARG version=3131.vf2b_b_798b_ce99-2
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"

ARG user=jenkins
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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 = "3131.vf2b_b_798b_ce99-1"
default = "3131.vf2b_b_798b_ce99-2"
}

variable "REGISTRY" {
Expand Down
2 changes: 1 addition & 1 deletion make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Param(
[String] $Target = "build",
[String] $Build = '',
[String] $VersionTag = '3071.v7e9b_0dc08466-1',
[String] $DockerAgentVersion = '3131.vf2b_b_798b_ce99-1',
[String] $DockerAgentVersion = '3131.vf2b_b_798b_ce99-2',
[switch] $PushVersions = $false
)

Expand Down
4 changes: 2 additions & 2 deletions windows/nanoserver-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3131.vf2b_b_798b_ce99-1
ARG version=3131.vf2b_b_798b_ce99-2
ARG JAVA_MAJOR_VERSION=17
FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-nanoserver-1809

ARG version=3131.vf2b_b_798b_ce99-1
ARG version=3131.vf2b_b_798b_ce99-2
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"

COPY jenkins-agent.ps1 C:/ProgramData/Jenkins
Expand Down
4 changes: 2 additions & 2 deletions windows/windowsservercore-ltsc2019/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3131.vf2b_b_798b_ce99-1
ARG version=3131.vf2b_b_798b_ce99-2
ARG JAVA_MAJOR_VERSION=17
FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-windowsservercore-ltsc2019

ARG version=3131.vf2b_b_798b_ce99-1
ARG version=3131.vf2b_b_798b_ce99-2
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"

COPY jenkins-agent.ps1 C:/ProgramData/Jenkins
Expand Down

0 comments on commit 879fb0c

Please sign in to comment.