From 487c6814f229be6f781a2aa88cd4939b65e56da9 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 24 Mar 2026 10:56:00 -0400
Subject: [PATCH] fix kubernetes-maven-plugin upgrade

---
 pom.xml                                  | 6 ++++--
 Dockerfile => src/main/docker/Dockerfile | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename Dockerfile => src/main/docker/Dockerfile (87%)

diff --git a/pom.xml b/pom.xml
index 7d17329..a8fbe9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,15 +56,17 @@
             <plugin>
                 <groupId>org.eclipse.jkube</groupId>
                 <artifactId>kubernetes-maven-plugin</artifactId>
-                <version>1.19.0</version> <!-- investigate why newer versions don't work -->
+                <version>1.19.0</version>
                 <configuration>
                     <images>
                         <image>
                             <name>${image.name}:${image.tag}</name>
                             <registry>${image.registry}</registry>
+                            <build>
+                                <contextDir>${project.build.directory}/resources</contextDir>
+                            </build>
                         </image>
                     </images>
-                    <contextDir>${project.build.directory}/resources</contextDir>
                     <buildStrategy>docker</buildStrategy>
                     <verbose>true</verbose>
                 </configuration>
diff --git a/Dockerfile b/src/main/docker/Dockerfile
similarity index 87%
rename from Dockerfile
rename to src/main/docker/Dockerfile
index 4dc9feb..2ac44dc 100644
--- a/Dockerfile
+++ b/src/main/docker/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/resources/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
-COPY maven/target/resources/docker-entrypoint.sh /usr/local/bin
+ADD maven/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
+COPY maven/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/resources/tomcat-context.xml /var/lib/tomcat/conf/context.xml
-ADD maven/target/resources/hotswap-agent.properties /var/lib/tomcat/lib
+COPY maven/tomcat-context.xml /var/lib/tomcat/conf/context.xml
+ADD maven/hotswap-agent.properties /var/lib/tomcat/lib
 
 # Listening for HTTP (not HTTPS) traffic
 EXPOSE 8080