From 8fcceaa19dba79f309bce382537bf15697ec1bdc Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Fri, 31 Jan 2025 16:44:05 -0500
Subject: [PATCH] refactored; downgrade jkube to v1.16.2

---
 Dockerfile                                          |  8 ++++----
 pom.xml                                             | 13 ++++---------
 .../main/docker/docker-entrypoint.sh                |  0
 .../main/docker/hotswap-agent.properties            |  0
 setenv.sh => src/main/docker/setenv.sh              |  0
 .../main/docker/tomcat-context.xml                  |  0
 6 files changed, 8 insertions(+), 13 deletions(-)
 rename docker-entrypoint.sh => src/main/docker/docker-entrypoint.sh (100%)
 rename hotswap-agent.properties => src/main/docker/hotswap-agent.properties (100%)
 rename setenv.sh => src/main/docker/setenv.sh (100%)
 rename tomcat-context.xml => src/main/docker/tomcat-context.xml (100%)

diff --git a/Dockerfile b/Dockerfile
index a333775..4dc9feb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,14 +28,14 @@ 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/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
diff --git a/pom.xml b/pom.xml
index 751de50..0421189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.18.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>
diff --git a/docker-entrypoint.sh b/src/main/docker/docker-entrypoint.sh
similarity index 100%
rename from docker-entrypoint.sh
rename to src/main/docker/docker-entrypoint.sh
diff --git a/hotswap-agent.properties b/src/main/docker/hotswap-agent.properties
similarity index 100%
rename from hotswap-agent.properties
rename to src/main/docker/hotswap-agent.properties
diff --git a/setenv.sh b/src/main/docker/setenv.sh
similarity index 100%
rename from setenv.sh
rename to src/main/docker/setenv.sh
diff --git a/tomcat-context.xml b/src/main/docker/tomcat-context.xml
similarity index 100%
rename from tomcat-context.xml
rename to src/main/docker/tomcat-context.xml