updated to tomcat v9.0.46

Dockerfile

@@ -1,25 +1,13 @@
 
-FROM ubuntu:${ubuntu.version}
+FROM docker.inteligr8.com/inteligr8/java-dcevm-hotswap:${java-dcevm-hotswap.version}
 
 # Configure the Apache Tomcat Catalina script
 ENV JAVA_MEMORY_INIT=128m
 ENV JAVA_MEMORY_MAX=512m
-ENV JAVA_HOME="/usr/local/lib/jvm/java-openjdk-dcevm"
 ENV CATALINA_HOME="/usr/local/share/tomcat"
 ENV CATALINA_BASE="/var/lib/tomcat"
 ENV CATALINA_OPTS=
 
-# Install curl
-RUN apt update && apt -y install curl
-
-# Download & Install DCEVM Java
-RUN mkdir -p /usr/local/lib/jvm && \
-        curl -L https://github.com/TravaOpenJDK/trava-jdk-${dcevm.majorVersion}-dcevm/releases/download/dcevm-${dcevm.version}/java${dcevm.majorVersion}-openjdk-dcevm-linux.tar.gz -o /usr/local/lib/jvm/java-openjdk-dcevm.tar.gz && \
-        cd /usr/local/lib/jvm && tar xzvf java-openjdk-dcevm.tar.gz && mv dcevm-${dcevm.version} java-openjdk-dcevm && rm java-openjdk-dcevm.tar.gz
-
-# Download Hotswap Agent
-RUN curl -L https://github.com/HotswapProjects/HotswapAgent/releases/download/RELEASE-${hotswap.version}/hotswap-agent-${hotswap.version}.jar -o /usr/local/lib/jvm/hotswap-agent.jar
-
 # Download & Install Apache Tomcat
 RUN mkdir -p /usr/local/share && \
         curl -L ${tomcat.mirror.baseUrl}/tomcat-${tomcat.majorVersion}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz -o /usr/local/share/apache-tomcat.tar.gz && \
@@ -38,7 +26,9 @@ RUN cd /var/lib/tomcat/dev && \
         mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
 
 # Add our Docker container initialization script
-ADD docker-entrypoint.sh /usr/local/bin
+ADD setenv.sh /usr/local/bin/${project.artifactId}-setenv.sh
+COPY docker-entrypoint.sh /usr/local/bin
+RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
 
 # Add our Apache Tomcat configuration
 #   This gives us dynamic injection points into the running webapps

README.md

@@ -0,0 +1,35 @@
+
+# Apache Tomcat Application Container Image with Hot-Reloading
+
+This project creates a Docker image that has uses the [Java DCEVM Hotswap Docker Image](/inteligr8/java-dcevm-hotswap-docker) to support hot-reloading for the enablement of rapid application development.  As a Docker image, containers can be started to facilitate development without requiring complicated installations on developer workstations.
+
+It is expected that containers are configured in Maven using the Fabric8 or Spotify Docker plugins.  These configurations should expose the 8080 (HTTP) and 8000 (debugger) ports and any other port that the application may open.  Most importantly, it should mount/bind the source code to the following possible paths.
+
+| Directory                            | Type      | Hot-Reloaded |
+| ------------------------------------ |:---------:|:------------:|
+| `/var/lib/tomcat/dev/classes`        | Classpath | Yes          |
+| `/var/lib/tomcat/dev/classes-extra1` | Classpath | Yes          |
+| `/var/lib/tomcat/dev/classes-extra2` | Classpath | Yes          |
+| `/var/lib/tomcat/dev/classes-extra3` | Classpath | Yes          |
+| `/var/lib/tomcat/dev/classes-extra4` | Classpath | Yes          |
+| `/var/lib/tomcat/dev/classes-extra5` | Classpath | Yes          |
+| `/var/lib/tomcat/dev/classes-extra6` | Classpath | Yes          |
+| `/var/lib/tomcat/dev/classes-extra7` | Classpath | Yes          |
+| `/var/lib/tomcat/dev/lib`            | JARs      | No           |
+| `/var/lib/tomcat/dev/lib-extra1`     | JARs      | No           |
+| `/var/lib/tomcat/dev/lib-extra2`     | JARs      | No           |
+| `/var/lib/tomcat/dev/lib-extra3`     | JARs      | No           |
+| `/var/lib/tomcat/dev/lib-extra4`     | JARs      | No           |
+| `/var/lib/tomcat/dev/lib-extra5`     | JARs      | No           |
+| `/var/lib/tomcat/dev/lib-extra6`     | JARs      | No           |
+| `/var/lib/tomcat/dev/lib-extra7`     | JARs      | No           |
+| `/var/lib/tomcat/dev/web`            | Web       | Yes          |
+| `/var/lib/tomcat/dev/web-extra1`     | Web       | Yes          |
+| `/var/lib/tomcat/dev/web-extra2`     | Web       | Yes          |
+| `/var/lib/tomcat/dev/web-extra3`     | Web       | Yes          |
+| `/var/lib/tomcat/dev/web-extra4`     | Web       | Yes          |
+| `/var/lib/tomcat/dev/web-extra5`     | Web       | Yes          |
+| `/var/lib/tomcat/dev/web-extra6`     | Web       | Yes          |
+| `/var/lib/tomcat/dev/web-extra7`     | Web       | Yes          |
+
+You may include your own `hotswap-agent.properties` in any of the `classes` folders.  The one loaded by default is usually sufficient.  It most notably disables the Hotswap Agent Hibernate plugin.

docker-entrypoint.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
-CATALINA_OPTS="-Xms${JAVA_MEMORY_INIT} -Xmx${JAVA_MEMORY_MAX} -XX:HotswapAgent=external -javaagent:/usr/local/lib/jvm/hotswap-agent.jar -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n $CATALINA_OPTS"
+#!/bin/sh
+. /usr/local/bin/java-dcevm-hotswap-setenv.sh
+. /usr/local/bin/tomcat-rad-setenv.sh
 
 exec "$@"

hotswap-agent.properties

@@ -7,7 +7,14 @@
 # This may be useful for example in multi module maven project to load class changes from upstream project
 # classes. Set extraClasspath to upstream project compiler output and .class file will have precedence to
 # classes from built JAR file.
-extraClasspath=/var/lib/tomcat/dev/classes
+extraClasspath=/var/lib/tomcat/dev/classes; \
+/var/lib/tomcat/dev/classes-extra1; \
+/var/lib/tomcat/dev/classes-extra2; \
+/var/lib/tomcat/dev/classes-extra3; \
+/var/lib/tomcat/dev/classes-extra4; \
+/var/lib/tomcat/dev/classes-extra5; \
+/var/lib/tomcat/dev/classes-extra6; \
+/var/lib/tomcat/dev/classes-extra7
 
 # Watch for changes in a directory (resources only). If not set, changes of resources won't be observed.
 #
@@ -19,7 +26,14 @@ extraClasspath=/var/lib/tomcat/dev/classes
 # replacements of resources in a building step (maven filtering resource option).
 # This setting will leave i.e. src/target/classes as default source for resources, but after the resource is modified
 # in src/main/resources, the new changed resource is served instead.
-watchResources=/var/lib/tomcat/dev/classes
+watchResources=/var/lib/tomcat/dev/classes; \
+/var/lib/tomcat/dev/classes-extra1; \
+/var/lib/tomcat/dev/classes-extra2; \
+/var/lib/tomcat/dev/classes-extra3; \
+/var/lib/tomcat/dev/classes-extra4; \
+/var/lib/tomcat/dev/classes-extra5; \
+/var/lib/tomcat/dev/classes-extra6; \
+/var/lib/tomcat/dev/classes-extra7
 
 # Load static web resources from different directory.
 #
@@ -27,6 +41,13 @@ watchResources=/var/lib/tomcat/dev/classes
 # Jboss and Glassfish are not yet supported.
 # Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp).
 webappDir=/var/lib/tomcat/dev/web
+#/var/lib/tomcat/dev/web-extra1; \
+#/var/lib/tomcat/dev/web-extra2; \
+#/var/lib/tomcat/dev/web-extra3; \
+#/var/lib/tomcat/dev/web-extra4; \
+#/var/lib/tomcat/dev/web-extra5; \
+#/var/lib/tomcat/dev/web-extra6; \
+#/var/lib/tomcat/dev/web-extra7
 
 
 # Comma separated list of disabled plugins

pom.xml

@@ -3,31 +3,21 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>tomcat-rad</artifactId>
-    <version>9-1.2</version>
+    <version>9-1.3</version>
     <name>Apache Tomcat for Rapid Application Development</name>
     <packaging>pom</packaging>
 
     <properties>
-        <!-- The release version of Ubuntu to use as the base -->
-        <!-- See: https://hub.docker.com/_/ubuntu -->
-        <!-- This has very little impact and may be replaced -->
-        <ubuntu.version>20.04</ubuntu.version>
-
-        <!-- The version of Java DCEVM to use for executing Apache Tomcat -->
-        <!-- See: https://github.com/TravaOpenJDK/trava-jdk-11-dcevm/releases -->
-        <dcevm.version>11.0.10+4</dcevm.version>
-        <dcevm.majorVersion>11</dcevm.majorVersion>
+        <!-- The release version of the Java DCEVM Hotswap Docker image -->
+        <!-- See: https://bitbucket.org/inteligr8/java-dcevm-hotswap-docker -->
+        <java-dcevm-hotswap.version>11.0.11-1.4.1</java-dcevm-hotswap.version>
 
         <!-- The version of Apache Tomcat to serve as the basis of this Docker image -->
         <!-- See: https://tomcat.apache.org/download-90.cgi -->
-        <tomcat.version>9.0.44</tomcat.version>
+        <tomcat.version>9.0.46</tomcat.version>
         <tomcat.majorVersion>9</tomcat.majorVersion>
         <tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl>
 
-        <!-- The version of the Hotswap Agent to use -->
-        <!-- See: https://github.com/HotswapProjects/HotswapAgent/releases -->
-        <hotswap.version>1.4.1</hotswap.version>
-
         <!-- The Docker image meta-data for pushing the build -->
         <image.name>inteligr8/${project.artifactId}</image.name>
         <image.tag>${project.version}</image.tag>

setenv.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+CATALINA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}"
+JAVA_OPTS=""