Merge branch 'master' into lemeurherve-patch-1

jenkinsci · Oct 24, 2023 · eefe79f · eefe79f
2 parents 5a26a7f + 930d307
commit eefe79f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.44.0
+        uses: updatecli/updatecli-action@v2.46.1
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml

diff --git a/alpine/Dockerfile b/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=3180.v3dd999d24861-2
+ARG version=3181.v78543a_987053-1
 ARG JAVA_MAJOR_VERSION=17
 FROM jenkins/agent:"${version}"-alpine-jdk"${JAVA_MAJOR_VERSION}"
 

diff --git a/build.ps1 b/build.ps1
@@ -4,7 +4,7 @@ Param(
     [String] $Target = "build",
     [String] $Build = '',
     [String] $VersionTag = 'NEXT_TAG_VERSION',
-    [String] $ParentImageVersion = '3180.v3dd999d24861-2',
+    [String] $ParentImageVersion = '3181.v78543a_987053-1',
 
     [switch] $PushVersions = $false
 )

diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -1,4 +1,4 @@
-ARG version=3180.v3dd999d24861-2
+ARG version=3181.v78543a_987053-1
 ARG JAVA_MAJOR_VERSION=17
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"
 

diff --git a/debian/preview/Dockerfile b/debian/preview/Dockerfile
@@ -1,4 +1,4 @@
-ARG version=3180.v3dd999d24861-2
+ARG version=3181.v78543a_987053-1-preview
 ARG JAVA_MAJOR_VERSION=21
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}-preview"
 

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -49,7 +49,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 = "3180.v3dd999d24861-2"
+  default = "3181.v78543a_987053-1"
 }
 
 variable "REGISTRY" {

diff --git a/windows/nanoserver/Dockerfile b/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=3180.v3dd999d24861-2
+ARG version=3181.v78543a_987053-1
 ARG JAVA_MAJOR_VERSION=17
 ARG WINDOWS_VERSION_TAG=1809
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-nanoserver-"${WINDOWS_VERSION_TAG}"

diff --git a/windows/windowsservercore/Dockerfile b/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=3180.v3dd999d24861-2
+ARG version=3181.v78543a_987053-1
 ARG JAVA_MAJOR_VERSION=17
 ARG WINDOWS_VERSION_TAG=ltsc2019
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-windowsservercore-"${WINDOWS_VERSION_TAG}"