inteligr8/tomcat-rad-image
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: inteligr8/tomcat-rad-image:v2.3-tomcat-10.1.52
Branches Tags
inteligr8/tomcat-rad-image:develop inteligr8/tomcat-rad-image:develop-tomcat11 inteligr8/tomcat-rad-image:develop-tomcat10 inteligr8/tomcat-rad-image:develop-tomcat9
inteligr8/tomcat-rad-image:v2.3-tomcat-v11.0.22 inteligr8/tomcat-rad-image:v2.3-tomcat-v10.1.55 inteligr8/tomcat-rad-image:v2.3-tomcat-11.0.20 inteligr8/tomcat-rad-image:v2.3-tomcat-10.1.52 inteligr8/tomcat-rad-image:v2.3-tomcat-9.0.116 inteligr8/tomcat-rad-image:v10-2.2 inteligr8/tomcat-rad-image:v9-2.2 inteligr8/tomcat-rad-image:v10-2.1 inteligr8/tomcat-rad-image:v9-2.1 inteligr8/tomcat-rad-image:v9-2.0 inteligr8/tomcat-rad-image:v9-1.5 inteligr8/tomcat-rad-image:v9-1.4 inteligr8/tomcat-rad-image:v9-1.3 inteligr8/tomcat-rad-image:v9-1.2 inteligr8/tomcat-rad-image:v9-1.1
...
compare: inteligr8/tomcat-rad-image:develop
Branches Tags
inteligr8/tomcat-rad-image:develop-tomcat11 inteligr8/tomcat-rad-image:develop-tomcat10 inteligr8/tomcat-rad-image:develop inteligr8/tomcat-rad-image:develop-tomcat9
inteligr8/tomcat-rad-image:v2.3-tomcat-v11.0.22 inteligr8/tomcat-rad-image:v2.3-tomcat-v10.1.55 inteligr8/tomcat-rad-image:v2.3-tomcat-11.0.20 inteligr8/tomcat-rad-image:v2.3-tomcat-10.1.52 inteligr8/tomcat-rad-image:v2.3-tomcat-9.0.116 inteligr8/tomcat-rad-image:v10-2.2 inteligr8/tomcat-rad-image:v9-2.2 inteligr8/tomcat-rad-image:v10-2.1 inteligr8/tomcat-rad-image:v9-2.1 inteligr8/tomcat-rad-image:v9-2.0 inteligr8/tomcat-rad-image:v9-1.5 inteligr8/tomcat-rad-image:v9-1.4 inteligr8/tomcat-rad-image:v9-1.3 inteligr8/tomcat-rad-image:v9-1.2 inteligr8/tomcat-rad-image:v9-1.1
3 Commits
v2.3-tomcat-10.1.52 ... develop
Author SHA1 Message Date
brian.long 11dcc50a0c refactored 2026-05-21 20:32:13 -04:00
brian.long b7ff68327a additional tagging 2026-05-21 09:04:46 -04:00
brian.long 849cfde955 tabs, not spaces 2026-05-20 16:40:08 -04:00
6 changed files with 151 additions and 118 deletions
Expand all files Collapse all files
pom.xml
+148 -99
View File
@@ -1,108 +1,157 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.inteligr8</groupId> <groupId>com.inteligr8</groupId>
<artifactId>tomcat-rad</artifactId> <artifactId>tomcat-rad</artifactId>
<version>${base.version}-tomcat-${tomcat.version}</version> <version>${base.version}-tomcat-${tomcat.version}</version>
<name>Apache Tomcat for Rapid Application Development</name> <name>Apache Tomcat for Rapid Application Development</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<base.version>2.3</base.version> <base.version>2.3</base.version>
<!-- The release version of the Java Hotswap Docker image --> <!-- The release version of the Java Hotswap Docker image -->
<!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker --> <!-- See: https://git.inteligr8.com/inteligr8/jdk-hotswap-image -->
<jdk-hotswap.version>2.0.3-jbr-17.0.14</jdk-hotswap.version> <!-- 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>
<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-10.cgi -->
<tomcat.version>10.1.52</tomcat.version>
<tomcat.mirror.baseUrl>https://archive.apache.org/dist/tomcat</tomcat.mirror.baseUrl>
<!-- The version of Apache Tomcat to serve as the basis of this Docker image --> <!-- The Docker image meta-data for pushing the build -->
<!-- See: https://tomcat.apache.org/download-10.cgi --> <image.name>inteligr8/${project.artifactId}</image.name>
<tomcat.version>10.1.52</tomcat.version> <image.tag>${project.version}</image.tag>
<tomcat.majorVersion>10</tomcat.majorVersion> <image.registry>docker.inteligr8.com</image.registry>
<tomcat.mirror.baseUrl>https://archive.apache.org/dist/tomcat</tomcat.mirror.baseUrl>
<!-- The Docker image meta-data for pushing the build --> <!-- using version properties so they can be overridden by child projects or Maven executions -->
<image.name>inteligr8/${project.artifactId}</image.name> <maven-resources-plugin.version>3.5.0</maven-resources-plugin.version>
<image.tag>${project.version}</image.tag> <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
<image.registry>docker.inteligr8.com</image.registry> <kubernetes-maven-plugin.version>1.19.0</kubernetes-maven-plugin.version>
</properties> <regex-maven-plugin.version>1.0.7</regex-maven-plugin.version>
</properties>
<build> <build>
<resources> <resources>
<resource> <resource>
<directory>src/main/docker</directory> <directory>src/main/containerd</directory>
<filtering>true</filtering> <filtering>true</filtering>
<targetPath>${project.build.directory}/resources</targetPath> <targetPath>${project.build.directory}/resources</targetPath>
</resource> </resource>
</resources> </resources>
<plugins> <pluginManagement>
<plugin> <plugins>
<artifactId>maven-resources-plugin</artifactId> <plugin>
<version>3.5.0</version> <artifactId>maven-resources-plugin</artifactId>
<executions> <version>${maven-resources-plugin.version}</version>
<execution> </plugin>
<id>copy-resources</id> <plugin>
<phase>process-resources</phase> <artifactId>maven-deploy-plugin</artifactId>
<goals><goal>resources</goal></goals> <version>${maven-deploy-plugin.version}</version>
<configuration> </plugin>
<encoding>utf-8</encoding> <plugin>
<propertiesEncoding>utf-8</propertiesEncoding> <groupId>org.eclipse.jkube</groupId>
</configuration> <artifactId>kubernetes-maven-plugin</artifactId>
</execution> <version>${kubernetes-maven-plugin.version}</version>
</executions> </plugin>
</plugin> <plugin>
<!-- This plugin build and pushes the Docker image --> <groupId>com.inteligr8</groupId>
<plugin> <artifactId>regex-maven-plugin</artifactId>
<groupId>org.eclipse.jkube</groupId> <version>${regex-maven-plugin.version}</version>
<artifactId>kubernetes-maven-plugin</artifactId> </plugin>
<version>1.19.0</version> </plugins>
<configuration> </pluginManagement>
<images> <plugins>
<image> <plugin>
<name>${image.name}:${image.tag}</name> <groupId>com.inteligr8</groupId>
<registry>${image.registry}</registry> <artifactId>regex-maven-plugin</artifactId>
<build> <executions>
<contextDir>${project.build.directory}/resources</contextDir> <execution>
</build> <id>determine-tomcat-major-version</id>
</image> <phase>validate</phase>
</images> <goals>
<buildStrategy>docker</buildStrategy> <goal>replace-property</goal>
<verbose>true</verbose> </goals>
</configuration> <configuration>
<executions> <property>tomcat.version</property>
<!-- This execution builds the Docker image --> <newProperty>tomcat.majorVersion</newProperty>
<execution> <regexes>
<id>docker-build</id> <regex>
<phase>package</phase> <pattern>([^.]+).*</pattern>
<goals><goal>build</goal></goals> <replacement>$1</replacement>
</execution> </regex>
<!-- This execution pushes the built Docker image to the configured Docker Registry --> </regexes>
<execution> </configuration>
<id>docker-push</id> </execution>
<phase>deploy</phase> </executions>
<goals><goal>push</goal></goals> </plugin>
</execution> <plugin>
</executions> <artifactId>maven-resources-plugin</artifactId>
</plugin> <executions>
<!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless --> <execution>
<plugin> <id>copy-resources</id>
<artifactId>maven-deploy-plugin</artifactId> <phase>process-resources</phase>
<version>3.1.4</version> <goals><goal>resources</goal></goals>
<configuration> <configuration>
<skip>true</skip> <encoding>utf-8</encoding>
</configuration> <propertiesEncoding>utf-8</propertiesEncoding>
</plugin> </configuration>
</plugins> </execution>
</build> </executions>
</plugin>
<!-- This plugin build and pushes the Docker image -->
<plugin>
<groupId>org.eclipse.jkube</groupId>
<artifactId>kubernetes-maven-plugin</artifactId>
<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>
<verbose>true</verbose>
</configuration>
<executions>
<!-- This execution builds the Docker image -->
<execution>
<id>docker-build</id>
<phase>package</phase>
<goals><goal>build</goal></goals>
</execution>
<!-- This execution pushes the built Docker image to the configured Docker Registry -->
<execution>
<id>docker-push</id>
<phase>deploy</phase>
<goals><goal>push</goal></goals>
</execution>
</executions>
</plugin>
<!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<profiles> <profiles>
<profile> <profile>
<id>no-docker</id> <id>no-docker</id>
<properties> <properties>
<fabric8.build.jib>true</fabric8.build.jib> <jkube.build.strategy>jib</jkube.build.strategy>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>
</project> </project>
src/main/docker/Dockerfile → src/main/containerd/Containerfile
+3 -14
View File
@@ -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 mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
# Add our Docker container initialization script # Add our Docker container initialization script
ADD maven/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh ADD --chmod=755 maven/setenv.sh ${CONTAINERD_ENTRYPOINT_PATH}/40-setenv-${artifactId}.sh
COPY maven/docker-entrypoint.sh /usr/local/bin
RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
# Add our Apache Tomcat configuration # Add our Apache Tomcat configuration
# This gives us dynamic injection points into the running webapps # This gives us dynamic injection points into the running webapps
COPY maven/tomcat-context.xml /var/lib/tomcat/conf/context.xml ADD --chmod=644 maven/tomcat-context.xml /var/lib/tomcat/conf/context.xml
ADD maven/hotswap-agent.properties /var/lib/tomcat/lib ADD --chmod=644 maven/hotswap-agent.properties /var/lib/tomcat/lib
# Listening for HTTP (not HTTPS) traffic # Listening for HTTP (not HTTPS) traffic
EXPOSE 8080 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 # Start the Apache Tomcat web container using the Catalina script
CMD [ "/usr/local/share/tomcat/bin/catalina.sh", "run" ] CMD [ "/usr/local/share/tomcat/bin/catalina.sh", "run" ]
src/main/docker/hotswap-agent.properties → src/main/containerd/hotswap-agent.properties
View File
src/main/docker/setenv.sh → src/main/containerd/setenv.sh
View File
src/main/docker/tomcat-context.xml → src/main/containerd/tomcat-context.xml
View File
src/main/docker/docker-entrypoint.sh
-5
View File
@@ -1,5 +0,0 @@
#!/bin/sh
. /usr/local/bin/jdk-hotswap-setenv.sh
. /usr/local/bin/${namespace.prefix}-setenv.sh
exec "$@"