Merge branch 'main' into ca-certs-rework-fixes

rassie · web-flow · commit bd5d0f1dc27b · 2024-06-12T09:24:53.000+02:00
diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/17/jdk/alpine/Dockerfile b/17/jdk/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/17/jre/alpine/Dockerfile b/17/jre/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/21/jdk/alpine/Dockerfile b/21/jdk/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/22/jdk/alpine/Dockerfile b/22/jdk/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/22/jre/alpine/Dockerfile b/22/jre/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/8/jdk/alpine/Dockerfile b/8/jdk/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/8/jre/alpine/Dockerfile b/8/jre/alpine/Dockerfile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ENV JAVA_HOME /opt/java/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/config/hotspot.yml b/config/hotspot.yml
@@ -49,7 +49,7 @@ configurations:
   alpine-linux:
   - directory: alpine
     architectures: [aarch64, x64]
-    image: alpine:3.19
+    image: alpine:3.20
     os: alpine-linux
   
   windows:

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`# limitations under the License.`
`18`	`18`	`#`
`19`	`19`
`20`		`-FROM alpine:3.19`
	`20`	`+FROM alpine:3.20`
`21`	`21`
`22`	`22`	`ENV JAVA_HOME /opt/java/openjdk`
`23`	`23`	`ENV PATH $JAVA_HOME/bin:$PATH`