This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7af5a1c0d7 Bump version numbers
7af5a1c0d7 is described below
commit 7af5a1c0d7e173f4cff4fb695df3bc8f222b3b00
Author: remm <r...@apache.org>
AuthorDate: Tue Jul 16 18:04:59 2024 +0200
Bump version numbers
---
modules/stuffed/Dockerfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/stuffed/Dockerfile b/modules/stuffed/Dockerfile
index 14eabd10dd..b5a8a72a95 100644
--- a/modules/stuffed/Dockerfile
+++ b/modules/stuffed/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM eclipse-temurin:21-jre
+FROM eclipse-temurin:22-jre
VOLUME /tmp
USER root
@@ -38,8 +38,8 @@ ENV JAVA_OPTS="-Dcatalina.base=.
-Djava.security.egd=file:/dev/urandom"
# Add JULI logging configuration
ENV JAVA_OPTS="${JAVA_OPTS}
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
-Djava.util.logging.config.file=conf/logging.properties"
-# OpenSSL integration for Java 17
-#ENV JAVA_OPTS="${JAVA_OPTS} --enable-native-access=ALL-UNNAMED --add-modules
jdk.incubator.foreign"
+# OpenSSL FFM
+ENV JAVA_OPTS="${JAVA_OPTS} --enable-native-access=ALL-UNNAMED"
RUN sh -c 'touch app.jar'
@@ -52,7 +52,7 @@ RUN mkdir -p /opt
# EXPOSE $jolokiaport
# Optional: Add Prometheus agent for JMX monitoring
-# RUN mkdir /opt/prometheus && wget
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.20.0/jmx_prometheus_javaagent-0.20.0.jar
-O /opt/prometheus/prometheus.jar && wget
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
-O conf/prometheus.yaml
+# RUN mkdir /opt/prometheus && wget
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/1.0.1/jmx_prometheus_javaagent-1.0.1.jar
-O /opt/prometheus/prometheus.jar && wget
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
-O conf/prometheus.yaml
# ARG prometheusport=9404
# ENV
JAVA_OPTS="-javaagent:/opt/prometheus/prometheus.jar=$prometheusport:conf/prometheus.yaml
${JAVA_OPTS}"
# EXPOSE $prometheusport
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
