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 #391 from jenkinsci/updatecli_4ef8049ef9f0373a94b0…
Browse files Browse the repository at this point in the history
…e3c2f88ab1e98fe34d9a1e7b1d2b5816d7420f71c3e3

Bump the parent image `jenkins/agent` version to 3148.v532a_7e715ee3-1
  • Loading branch information
dduportal authored Aug 28, 2023
2 parents a145606 + d6b409e commit c7a34df
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 @@ -20,11 +20,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3142.vcfca_0cd92128-2
ARG version=3148.v532a_7e715ee3-1
ARG JAVA_MAJOR_VERSION=17
FROM jenkins/agent:"${version}"-alpine-jdk"${JAVA_MAJOR_VERSION}"

ARG version=3142.vcfca_0cd92128-2
ARG version=3148.v532a_7e715ee3-1
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 build.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 = 'NEXT_TAG_VERSION',
[String] $ParentImageVersion = '3142.vcfca_0cd92128-2',
[String] $ParentImageVersion = '3148.v532a_7e715ee3-1',
[switch] $PushVersions = $false
)

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=3142.vcfca_0cd92128-2
ARG version=3148.v532a_7e715ee3-1
ARG JAVA_MAJOR_VERSION=17
FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"

ARG version=3142.vcfca_0cd92128-2
ARG version=3148.v532a_7e715ee3-1
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_VERSION>-<base-os>)
variable "PARENT_IMAGE_VERSION" {
default = "3142.vcfca_0cd92128-2"
default = "3148.v532a_7e715ee3-1"
}

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

ARG version=3142.vcfca_0cd92128-2
ARG version=3148.v532a_7e715ee3-1
ARG JAVA_MAJOR_VERSION=17
ARG WINDOWS_VERSION_TAG=1809
FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-nanoserver-"${WINDOWS_VERSION_TAG}"

ARG version=3142.vcfca_0cd92128-2
ARG version=3148.v532a_7e715ee3-1
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/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ARG version=3142.vcfca_0cd92128-2
ARG version=3148.v532a_7e715ee3-1
ARG JAVA_MAJOR_VERSION=17
ARG WINDOWS_VERSION_TAG=ltsc2019
FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-windowsservercore-"${WINDOWS_VERSION_TAG}"

ARG version=3142.vcfca_0cd92128-2
ARG version=3148.v532a_7e715ee3-1
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 c7a34df

Please sign in to comment.