Fixes #327 - Update to latest version of Piranha (#328)

azure-appconfig/src/main/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/piranhacloud/webprofile:23.12.0
+FROM ghcr.io/piranhacloud/webprofile:24.1.0
 ADD target/ROOT.war /home/piranha
 ADD src/main/docker/startup.sh /home/piranha
 WORKDIR /home/piranha

azure-keyvault/pom.xml

@@ -30,22 +30,10 @@
     </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-jetty-servlet</artifactId>
-            <version>${jersey.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-binding</artifactId>
-            <version>${jersey.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-            <version>${jersey.version}</version>
-            <scope>compile</scope>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>${jakarta.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
@@ -123,7 +111,7 @@
                     </environmentVariables>
                     <systemPropertyVariables>
                         <javax.net.ssl.trustStore>${basedir}/src/test/certs/keystore</javax.net.ssl.trustStore>
-                        <javax.net.ssl.trustStorePassword>changeit</javax.net.ssl.trustStorePassword>
+                        <javax.net.ssl.trustStorePassword>password</javax.net.ssl.trustStorePassword>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -161,12 +149,9 @@
                                 </ports>
                                 <volumes>
                                     <bind>
-                                        <volume>${basedir}/src/test/certs:/usr/local/tomcat/conf/certs</volume>
+                                        <volume>${basedir}/src/test/certs:/home/piranha/certs</volume>
                                     </bind>
                                 </volumes>
-                                <log>
-                                    <file>${project.build.directory}/container.log</file>
-                                </log>
                                 <wait> 
                                     <http>
                                         <url>http://localhost:8100/</url>
@@ -176,7 +161,6 @@
                             </run>
                         </image>
                     </images>
-                    <showLogs>true</showLogs>
                 </configuration>
                 <executions>
                     <execution>
@@ -193,9 +177,6 @@
                             <goal>build</goal>
                             <goal>start</goal>
                         </goals>
-                        <configuration>
-                            <logStdout>true</logStdout>
-                        </configuration>
                     </execution>
                     <execution>
                         <id>stop</id>

azure-keyvault/src/main/docker/Dockerfile

@@ -1,6 +1,8 @@
-FROM tomcat:10.1.18-jre17-temurin
-ADD target/ROOT.war /usr/local/tomcat/webapps
-ADD src/main/docker/server.xml /usr/local/tomcat/conf
-WORKDIR /usr/local/tomcat/conf
+FROM ghcr.io/piranhacloud/webprofile:24.1.0
+ADD target/ROOT.war /home/piranha
+ADD src/main/docker/startup.sh /home/piranha
+WORKDIR /home/piranha
+USER piranha
 RUN mkdir certs && \
-    keytool -genkey -alias tomcat -keyalg RSA -keystore certs/keystore -keysize 4096 -storepass changeit -dname "CN=localhost"
+    keytool -genkey -alias self-signed -keyalg RSA -keystore certs/keystore -keysize 4096 -storepass password -dname "CN=localhost"
+CMD ["sh", "./startup.sh"]

azure-keyvault/src/main/docker/startup.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+#
+# Run the application
+#
+java -jar piranha-dist-webprofile.jar --war-file ROOT.war --http-port 8100 --https-port 8200 --https-keystore-file certs/keystore --https-keystore-password password