You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2018/12/19 15:34:37 UTC
svn commit: r1849306 - in /tomcat/trunk: res/tomcat-maven/Dockerfile
webapps/docs/changelog.xml
Author: remm
Date: Wed Dec 19 15:34:36 2018
New Revision: 1849306
URL: http://svn.apache.org/viewvc?rev=1849306&view=rev
Log:
Add optional monitoring contraptions to the image.
Modified:
tomcat/trunk/res/tomcat-maven/Dockerfile
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/tomcat-maven/Dockerfile
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat-maven/Dockerfile?rev=1849306&r1=1849305&r2=1849306&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat-maven/Dockerfile (original)
+++ tomcat/trunk/res/tomcat-maven/Dockerfile Wed Dec 19 15:34:36 2018
@@ -26,12 +26,30 @@ ADD webapps /deployments/webapps
WORKDIR /deployments
-ARG namespace=myproject
+ARG namespace=tomcat
ENV KUBERNETES_NAMESPACE=$namespace
ARG port=8080
EXPOSE $port
+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"
+
RUN sh -c 'touch app.jar'
-ENV JAVA_OPTS="-Dcatalina.base=. -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=conf/logging.properties -Djava.security.egd=file:/dev/urandom"
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar app.jar" ]
+RUN mkdir /opt
+
+# Optional: Add Jolokia agent for JMX monitoring and management
+# RUN mkdir /opt/jolokia && wget http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.0/jolokia-jvm-1.6.0-agent.jar -O /opt/jolokia/jolokia.jar
+# ARG jolokiaport=8778
+# ENV JAVA_OPTS="-javaagent:/opt/jolokia/jolokia.jar=host=*,port=$jolokiaport,protocol=https,authIgnoreCerts=true ${JAVA_OPTS}"
+# EXPOSE $jolokiaport
+
+# Optional: Add Prometheus agent for JMX monitoring
+# RUN mkdir /opt/prometheus && wget http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.10/jmx_prometheus_javaagent-0.10.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
+
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar app.jar" ]
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1849306&r1=1849305&r2=1849306&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 19 15:34:36 2018
@@ -89,6 +89,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Update container image with monitoring contraptions. (remm)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.14 (markt)" rtext="2018-12-12">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org