Skip to content

Commit b3f6228

Browse files
authored
Merge pull request #501 from gregjotau/contrib/jdk25-docker-runtime
Run maintained Docker images on JDK 25
2 parents 66d68e9 + d3564c8 commit b3f6228

9 files changed

Lines changed: 9 additions & 9 deletions

docker/Dockerfile-release-binary-mongodb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN echo Downloading phoss SMP $SMP_VERSION \
3535

3636

3737
# Use an official Tomcat runtime as a base image
38-
FROM tomcat:10.1-jdk21
38+
FROM tomcat:10.1-jdk25
3939

4040
# Use non-blocking random
4141
ENV CATALINA_OPTS="-Djava.security.egd=file:/dev/urandom"

docker/Dockerfile-release-binary-sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN echo Downloading phoss SMP $SMP_VERSION \
3535

3636

3737
# Use an official Tomcat runtime as a base image
38-
FROM tomcat:10.1-jdk21
38+
FROM tomcat:10.1-jdk25
3939

4040
# Use non-blocking random
4141
ENV CATALINA_OPTS="-Djava.security.egd=file:/dev/urandom"

docker/Dockerfile-release-binary-xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN echo Downloading phoss SMP $SMP_VERSION \
3535

3636

3737
# Use an official Tomcat runtime as a base image
38-
FROM tomcat:10.1-jdk21
38+
FROM tomcat:10.1-jdk25
3939

4040
# Use non-blocking random
4141
ENV CATALINA_OPTS="-Djava.security.egd=file:/dev/urandom"

docker/Dockerfile-release-from-source-xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN echo Building phoss SMP $SMP_VERSION \
3030

3131

3232
# Use an official Tomcat runtime as a base image
33-
FROM tomcat:10.1-jdk21
33+
FROM tomcat:10.1-jdk25
3434

3535
# Use non-blocking random
3636
ENV CATALINA_OPTS="-Djava.security.egd=file:/dev/urandom"

docker/Dockerfile-snapshot-from-local-source-sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# Use an official Tomcat runtime as a base image
19-
FROM tomcat:10.1-jdk21
19+
FROM tomcat:10.1-jdk25
2020

2121
# Use non-blocking random
2222
ENV CATALINA_OPTS="-Djava.security.egd=file:/dev/urandom -Dorg.apache.catalina.session.StandardSession.ACTIVITY_CHECK=true"

docker/Dockerfile-snapshot-from-source-mongodb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# Use an official Tomcat runtime as a base image
19-
FROM tomcat:10.1-jdk21
19+
FROM tomcat:10.1-jdk25
2020

2121
# Use non-blocking random
2222
ENV CATALINA_OPTS="-Djava.security.egd=file:/dev/urandom"

docker/Dockerfile-snapshot-from-source-sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# Use an official Tomcat runtime as a base image
19-
FROM tomcat:10.1-jdk21
19+
FROM tomcat:10.1-jdk25
2020

2121
# Use non-blocking random
2222
ENV CATALINA_OPTS="-Djava.security.egd=file:/dev/urandom"

docker/Dockerfile-snapshot-from-source-xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# Use an official Tomcat runtime as a base image
19-
FROM tomcat:10.1-jdk21
19+
FROM tomcat:10.1-jdk25
2020

2121
# Use non-blocking random
2222
ENV CATALINA_OPTS="-Djava.security.egd=file:/dev/urandom"

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# phoss SMP Docker configuration
22

33
This folder contains the Docker configuration files for phoss SMP.
4-
It is based on the official `tomcat:10.1-jdk17` image since v7.0.0.
4+
It is based on the official `tomcat:10.1-jdk25` image.
55
It is recommended to run production Docker images with at least 4GB of RAM.
66

77
Prebuild images are available from:

0 commit comments

Comments
 (0)