refactored

README.md

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

docker-entrypoint.sh

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

pom.xml

@@ -3,46 +3,91 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.inteligr8</groupId>
 	<artifactId>tomcat-rad</artifactId>
-    <version>9-2.0</version>
+	<version>${base.version}-tomcat-${tomcat.version}</version>
 	<name>Apache Tomcat for Rapid Application Development</name>
 	<packaging>pom</packaging>
 
 	<properties>
-        <!-- The release version of the Java Hotswap Docker image -->
+		<base.version>2.3</base.version>
-        <!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker -->
-        <jdk-hotswap.version>1.4.1-jbr-17.0.8</jdk-hotswap.version>
 		
-        <namespace.prefix>tomcat-rad</namespace.prefix>
+		<!-- The release version of the Java Hotswap Docker image -->
+		<!-- See: https://git.inteligr8.com/inteligr8/jdk-hotswap-image -->
+		<!-- See: https://repos.inteligr8.com/nexus/service/rest/repository/browse/inteligr8-docker-public/v2/inteligr8/jdk-hotswap/tags/ -->
+		<jdk-hotswap.version>2.0.3-jbr17</jdk-hotswap.version>
 
 		<!-- The version of Apache Tomcat to serve as the basis of this Docker image -->
-        <!-- See: https://tomcat.apache.org/download-90.cgi -->
+		<!-- See: https://tomcat.apache.org/download-10.cgi -->
-        <tomcat.version>9.0.80</tomcat.version>
+		<tomcat.version>10.1.52</tomcat.version>
-        <tomcat.majorVersion>9</tomcat.majorVersion>
+		<tomcat.mirror.baseUrl>https://archive.apache.org/dist/tomcat</tomcat.mirror.baseUrl>
-        <tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl>
 
 		<!-- The Docker image meta-data for pushing the build -->
 		<image.name>inteligr8/${project.artifactId}</image.name>
 		<image.tag>${project.version}</image.tag>
 		<image.registry>docker.inteligr8.com</image.registry>
+
+		<!-- using version properties so they can be overridden by child projects or Maven executions -->
+		<maven-resources-plugin.version>3.5.0</maven-resources-plugin.version>
+		<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
+		<kubernetes-maven-plugin.version>1.19.0</kubernetes-maven-plugin.version>
+		<regex-maven-plugin.version>1.0.7</regex-maven-plugin.version>
 	</properties>
 
 	<build>
 		<resources>
 			<resource>
-                <directory>.</directory>
+				<directory>src/main/containerd</directory>
-                <includes>
-                    <include>*.sh</include>
-                    <include>*.properties</include>
-                    <include>*.xml</include>
-                </includes>
 				<filtering>true</filtering>
-                <targetPath>${project.build.directory}</targetPath>
+				<targetPath>${project.build.directory}/resources</targetPath>
 			</resource>
 		</resources>
+		<pluginManagement>
 			<plugins>
 				<plugin>
 					<artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
+					<version>${maven-resources-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>${maven-deploy-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.jkube</groupId>
+					<artifactId>kubernetes-maven-plugin</artifactId>
+					<version>${kubernetes-maven-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>com.inteligr8</groupId>
+					<artifactId>regex-maven-plugin</artifactId>
+					<version>${regex-maven-plugin.version}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>com.inteligr8</groupId>
+				<artifactId>regex-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>determine-tomcat-major-version</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>replace-property</goal>
+						</goals>
+						<configuration>
+							<property>tomcat.version</property>
+							<newProperty>tomcat.majorVersion</newProperty>
+							<regexes>
+								<regex>
+									<pattern>([^.]+).*</pattern>
+									<replacement>$1</replacement>
+								</regex>
+							</regexes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
 				<executions>
 					<execution>
 						<id>copy-resources</id>
@@ -59,16 +104,20 @@
 			<plugin>
 				<groupId>org.eclipse.jkube</groupId>
 				<artifactId>kubernetes-maven-plugin</artifactId>
-                <version>1.14.0</version>
 				<configuration>
 					<images>
 						<image>
 							<name>${image.name}:${image.tag}</name>
 							<registry>${image.registry}</registry>
+							<build>
+								<contextDir>${project.build.directory}/resources</contextDir>
+								<dockerFile>Containerfile</dockerFile>
+								<tags>
+									<tag>${base.version}-tomcat${tomcat.majorVersion}</tag>
+								</tags>
+							</build>
 						</image>
 					</images>
-                    <contextDir>${basedir}</contextDir>
-                    <buildStrategy>docker</buildStrategy>
 					<verbose>true</verbose>
 				</configuration>
 				<executions>
@@ -89,7 +138,6 @@
 			<!-- 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>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
@@ -101,7 +149,7 @@
 		<profile>
 			<id>no-docker</id>
 			<properties>
-                <fabric8.build.jib>true</fabric8.build.jib>
+				<jkube.build.strategy>jib</jkube.build.strategy>
 			</properties>
 		</profile>
 	</profiles>

src/main/containerd/Containerfile

@@ -22,30 +22,21 @@ 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
+ADD --chmod=755 maven/setenv.sh ${CONTAINERD_ENTRYPOINT_PATH}/40-setenv-${artifactId}.sh
-COPY maven/target/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 --chmod=644 maven/tomcat-context.xml /var/lib/tomcat/conf/context.xml
-ADD maven/target/hotswap-agent.properties /var/lib/tomcat/lib
+ADD --chmod=644 maven/hotswap-agent.properties /var/lib/tomcat/lib
 
 # Listening for HTTP (not HTTPS) traffic
 EXPOSE 8080
 
-# Listening for Java debugger traffic
-EXPOSE 8000
-
-# Running as ROOT user for now
-#USER tomcat
-
-# Execute the Docker container initialization script
-ENTRYPOINT [ "/usr/local/bin/docker-entrypoint.sh" ]
-
 # Start the Apache Tomcat web container using the Catalina script
 CMD [ "/usr/local/share/tomcat/bin/catalina.sh", "run" ]

src/main/containerd/hotswap-agent.properties

@@ -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.
 #

src/main/containerd/tomcat-context.xml

@@ -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="/" />