Compare commits

...

12 Commits

7 changed files with 74 additions and 53 deletions

View File

@ -1,5 +1,5 @@
FROM docker.inteligr8.com/inteligr8/java-dcevm-hotswap:${java-dcevm-hotswap.version}
FROM docker.inteligr8.com/inteligr8/jdk-hotswap:${jdk-hotswap.version}
# Configure the Apache Tomcat Catalina script
ENV JAVA_MEMORY_INIT=128m
@ -22,18 +22,20 @@ RUN cd /usr/local/share/tomcat && \
# Add directories for dynamic injection points
RUN cd /var/lib/tomcat/dev && \
mkdir classes classes-extra1 classes-extra2 classes-extra3 classes-extra4 classes-extra5 classes-extra6 classes-extra7 && \
mkdir post-rsrc post-rsrc-extra1 post-rsrc-extra2 post-rsrc-extra3 && \
mkdir lib lib-extra1 lib-extra2 lib-extra3 lib-extra4 lib-extra5 lib-extra6 lib-extra7 && \
mkdir post-lib post-lib-extra1 post-lib-extra2 post-lib-extra3 && \
mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
# Add our Docker container initialization script
ADD maven/target/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
COPY maven/target/docker-entrypoint.sh /usr/local/bin
ADD maven/target/resources/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
COPY maven/target/resources/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
COPY maven/target/tomcat-context.xml /var/lib/tomcat/conf/context.xml
ADD maven/target/hotswap-agent.properties /var/lib/tomcat/lib
COPY maven/target/resources/tomcat-context.xml /var/lib/tomcat/conf/context.xml
ADD maven/target/resources/hotswap-agent.properties /var/lib/tomcat/lib
# Listening for HTTP (not HTTPS) traffic
EXPOSE 8080

View File

@ -1,35 +1,43 @@
# 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.
This project creates a Docker image that has uses the [Java Hotswap Docker Image](/inteligr8/jdk-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 |
| Directory | Type | Hot-Reloaded | When |
| -------------------------------------- |:---------:|:------------:|:----:|
| `/var/lib/tomcat/dev/classes` | Classpath | Yes | Before WAR |
| `/var/lib/tomcat/dev/classes-extra1` | Classpath | Yes | Before WAR |
| `/var/lib/tomcat/dev/classes-extra2` | Classpath | Yes | Before WAR |
| `/var/lib/tomcat/dev/classes-extra3` | Classpath | Yes | Before WAR |
| `/var/lib/tomcat/dev/classes-extra4` | Classpath | Yes | Before WAR |
| `/var/lib/tomcat/dev/classes-extra5` | Classpath | Yes | Before WAR |
| `/var/lib/tomcat/dev/classes-extra6` | Classpath | Yes | Before WAR |
| `/var/lib/tomcat/dev/classes-extra7` | Classpath | Yes | Before WAR |
| `/var/lib/tomcat/dev/post-rsrc` | Classpath | Yes | After WAR |
| `/var/lib/tomcat/dev/post-rsrc-extra1` | Classpath | Yes | After WAR |
| `/var/lib/tomcat/dev/post-rsrc-extra2` | Classpath | Yes | After WAR |
| `/var/lib/tomcat/dev/post-rsrc-extra3` | Classpath | Yes | After WAR |
| `/var/lib/tomcat/dev/lib` | JARs | No | Before WAR |
| `/var/lib/tomcat/dev/lib-extra1` | JARs | No | Before WAR |
| `/var/lib/tomcat/dev/lib-extra2` | JARs | No | Before WAR |
| `/var/lib/tomcat/dev/lib-extra3` | JARs | No | Before WAR |
| `/var/lib/tomcat/dev/lib-extra4` | JARs | No | Before WAR |
| `/var/lib/tomcat/dev/lib-extra5` | JARs | No | Before WAR |
| `/var/lib/tomcat/dev/lib-extra6` | JARs | No | Before WAR |
| `/var/lib/tomcat/dev/lib-extra7` | JARs | No | Before WAR |
| `/var/lib/tomcat/dev/post-lib` | JARs | No | After WAR |
| `/var/lib/tomcat/dev/post-lib-extra1` | JARs | No | After WAR |
| `/var/lib/tomcat/dev/post-lib-extra2` | JARs | No | After WAR |
| `/var/lib/tomcat/dev/post-lib-extra3` | JARs | No | After WAR |
| `/var/lib/tomcat/dev/web` | Web | Yes | Before WAR |
| `/var/lib/tomcat/dev/web-extra1` | Web | No | Before WAR |
| `/var/lib/tomcat/dev/web-extra2` | Web | NO | Before WAR |
| `/var/lib/tomcat/dev/web-extra3` | Web | NO | Before WAR |
| `/var/lib/tomcat/dev/web-extra4` | Web | No | Before WAR |
| `/var/lib/tomcat/dev/web-extra5` | Web | No | Before WAR |
| `/var/lib/tomcat/dev/web-extra6` | Web | No | Before WAR |
| `/var/lib/tomcat/dev/web-extra7` | Web | No | Before WAR |
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.

31
pom.xml
View File

@ -3,22 +3,22 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.inteligr8</groupId>
<artifactId>tomcat-rad</artifactId>
<version>9-1.5</version>
<version>10-2.2</version>
<name>Apache Tomcat for Rapid Application Development</name>
<packaging>pom</packaging>
<properties>
<!-- 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.15-1.4.1</java-dcevm-hotswap.version>
<!-- The release version of the Java Hotswap Docker image -->
<!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker -->
<jdk-hotswap.version>2.0.1-jbr-17.0.14</jdk-hotswap.version>
<namespace.prefix>tomcat-rad</namespace.prefix>
<!-- 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.80</tomcat.version>
<tomcat.majorVersion>9</tomcat.majorVersion>
<tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl>
<!-- See: https://tomcat.apache.org/download-10.cgi -->
<tomcat.version>10.1.41</tomcat.version>
<tomcat.majorVersion>10</tomcat.majorVersion>
<tomcat.mirror.baseUrl>https://archive.apache.org/dist/tomcat</tomcat.mirror.baseUrl>
<!-- The Docker image meta-data for pushing the build -->
<image.name>inteligr8/${project.artifactId}</image.name>
@ -29,14 +29,9 @@
<build>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>*.sh</include>
<include>*.properties</include>
<include>*.xml</include>
</includes>
<directory>src/main/docker</directory>
<filtering>true</filtering>
<targetPath>${project.build.directory}</targetPath>
<targetPath>${project.build.directory}/resources</targetPath>
</resource>
</resources>
<plugins>
@ -59,7 +54,7 @@
<plugin>
<groupId>org.eclipse.jkube</groupId>
<artifactId>kubernetes-maven-plugin</artifactId>
<version>1.14.0</version>
<version>1.16.2</version>
<configuration>
<images>
<image>
@ -67,7 +62,7 @@
<registry>${image.registry}</registry>
</image>
</images>
<contextDir>${basedir}</contextDir>
<contextDir>${project.build.directory}/resources</contextDir>
<buildStrategy>docker</buildStrategy>
<verbose>true</verbose>
</configuration>
@ -89,7 +84,7 @@
<!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.3</version>
<configuration>
<skip>true</skip>
</configuration>

View File

@ -1,5 +1,5 @@
#!/bin/sh
. /usr/local/bin/java-dcevm-hotswap-setenv.sh
. /usr/local/bin/jdk-hotswap-setenv.sh
. /usr/local/bin/${namespace.prefix}-setenv.sh
exec "$@"

View File

@ -14,7 +14,11 @@ extraClasspath=/var/lib/tomcat/dev/classes; \
/var/lib/tomcat/dev/classes-extra4; \
/var/lib/tomcat/dev/classes-extra5; \
/var/lib/tomcat/dev/classes-extra6; \
/var/lib/tomcat/dev/classes-extra7
/var/lib/tomcat/dev/classes-extra7; \
/var/lib/tomcat/dev/post-rsrc; \
/var/lib/tomcat/dev/post-rsrc-extra1; \
/var/lib/tomcat/dev/post-rsrc-extra2; \
/var/lib/tomcat/dev/post-rsrc-extra3
# Watch for changes in a directory (resources only). If not set, changes of resources won't be observed.
#
@ -33,7 +37,11 @@ watchResources=/var/lib/tomcat/dev/classes; \
/var/lib/tomcat/dev/classes-extra4; \
/var/lib/tomcat/dev/classes-extra5; \
/var/lib/tomcat/dev/classes-extra6; \
/var/lib/tomcat/dev/classes-extra7
/var/lib/tomcat/dev/classes-extra7; \
/var/lib/tomcat/dev/post-rsrc; \
/var/lib/tomcat/dev/post-rsrc-extra1; \
/var/lib/tomcat/dev/post-rsrc-extra2; \
/var/lib/tomcat/dev/post-rsrc-extra3
# Load static web resources from different directory.
#

View File

@ -40,6 +40,10 @@
<PreResources base="/var/lib/tomcat/dev/classes-extra5" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
<PreResources base="/var/lib/tomcat/dev/classes-extra6" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
<PreResources base="/var/lib/tomcat/dev/classes-extra7" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
<PostResources base="/var/lib/tomcat/dev/post-rsrc" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
<PostResources base="/var/lib/tomcat/dev/post-rsrc-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
<PostResources base="/var/lib/tomcat/dev/post-rsrc-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
<PostResources base="/var/lib/tomcat/dev/post-rsrc-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/classes" />
<!-- Injection point for JARs -->
<PreResources base="/var/lib/tomcat/dev/lib" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
<PreResources base="/var/lib/tomcat/dev/lib-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
@ -49,6 +53,10 @@
<PreResources base="/var/lib/tomcat/dev/lib-extra5" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
<PreResources base="/var/lib/tomcat/dev/lib-extra6" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
<PreResources base="/var/lib/tomcat/dev/lib-extra7" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
<PostResources base="/var/lib/tomcat/dev/post-lib" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
<PostResources base="/var/lib/tomcat/dev/post-lib-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
<PostResources base="/var/lib/tomcat/dev/post-lib-extra2" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
<PostResources base="/var/lib/tomcat/dev/post-lib-extra3" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" />
<!-- Injection points for web -->
<PreResources base="/var/lib/tomcat/dev/web" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />
<PreResources base="/var/lib/tomcat/dev/web-extra1" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/" />