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

MarkEWaite · MarkEWaite · commit abedbbf6f520 · 2025-06-02T11:39:36.000-06:00
diff --git a/alpine/hotspot/Dockerfile b/alpine/hotspot/Dockerfile
@@ -1,4 +1,4 @@
-ARG ALPINE_TAG=3.21.3
+ARG ALPINE_TAG=3.22.0
 
 FROM alpine:"${ALPINE_TAG}" AS jre-build
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -75,7 +75,7 @@ variable "COMMIT_SHA" {
 }
 
 variable "ALPINE_FULL_TAG" {
-  default = "3.21.3"
+  default = "3.22.0"
 }
 
 variable "ALPINE_SHORT_TAG" {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG ALPINE_TAG=3.21.3`
	`1`	`+ARG ALPINE_TAG=3.22.0`
`2`	`2`
`3`	`3`	`FROM alpine:"${ALPINE_TAG}" AS jre-build`
`4`	`4`