Merge branch 'develop' into develop-tomcat11

pom.xml

@@ -3,41 +3,91 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.inteligr8</groupId>
 	<artifactId>tomcat-rad</artifactId>
-    <version>9-2.2</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 -->
-        <!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker -->
-        <jdk-hotswap.version>2.0.1-jbr-17.0.12</jdk-hotswap.version>
+		<base.version>2.3</base.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-jbr21</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 -->
-        <tomcat.version>9.0.98</tomcat.version>
-        <tomcat.majorVersion>9</tomcat.majorVersion>
+		<!-- See: https://tomcat.apache.org/download-11.cgi -->
+		<tomcat.version>11.0.22</tomcat.version>
 		<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>
 		<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>src/main/docker</directory>
+				<directory>src/main/containerd</directory>
 				<filtering>true</filtering>
 				<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>
@@ -54,16 +104,20 @@
 			<plugin>
 				<groupId>org.eclipse.jkube</groupId>
 				<artifactId>kubernetes-maven-plugin</artifactId>
-                <version>1.16.2</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>${project.build.directory}/resources</contextDir>
-                    <buildStrategy>docker</buildStrategy>
 					<verbose>true</verbose>
 				</configuration>
 				<executions>
@@ -84,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.3</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
@@ -96,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

@@ -28,26 +28,15 @@ 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 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 --chmod=755 maven/setenv.sh ${CONTAINERD_ENTRYPOINT_PATH}/40-setenv-${artifactId}.sh
 
 # Add our Apache Tomcat configuration
 #   This gives us dynamic injection points into the running webapps
-COPY maven/target/resources/tomcat-context.xml /var/lib/tomcat/conf/context.xml
-ADD maven/target/resources/hotswap-agent.properties /var/lib/tomcat/lib
+ADD --chmod=644 maven/tomcat-context.xml /var/lib/tomcat/conf/context.xml
+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/docker/docker-entrypoint.sh

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