Merge remote-tracking branch 'upstream/master' into lts

MarkEWaite · MarkEWaite · commit eb4bee9c1b39 · 2025-06-16T18:54:54.000-06:00
diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.84.0
+        uses: updatecli/updatecli-action@v2.86.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml
diff --git a/debian/bookworm-slim/hotspot/Dockerfile b/debian/bookworm-slim/hotspot/Dockerfile
@@ -1,4 +1,4 @@
-ARG BOOKWORM_TAG=20250520
+ARG BOOKWORM_TAG=20250610
 
 FROM debian:bookworm-"${BOOKWORM_TAG}"-slim AS jre-build
 
diff --git a/debian/bookworm/hotspot/Dockerfile b/debian/bookworm/hotspot/Dockerfile
@@ -1,4 +1,4 @@
-ARG BOOKWORM_TAG=20250520
+ARG BOOKWORM_TAG=20250610
 
 FROM debian:bookworm-"${BOOKWORM_TAG}" AS jre-build
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -91,7 +91,7 @@ variable "JAVA21_VERSION" {
 }
 
 variable "BOOKWORM_TAG" {
-  default = "20250520"
+  default = "20250610"
 }
 
 # ----  user-defined functions ----

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG BOOKWORM_TAG=20250520`
	`1`	`+ARG BOOKWORM_TAG=20250610`
`2`	`2`
`3`	`3`	`FROM debian:bookworm-"${BOOKWORM_TAG}"-slim AS jre-build`
`4`	`4`