fix: use bitnami's image instead of building it

Signed-off-by: WoodenMaiden <yann.pomie@laposte.net>
SouthGreenPlatform · Jun 3, 2024 · d19e12c · d19e12c
1 parent 14fc759
commit d19e12c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/agrold-javaweb/.vscode.template/settings.json b/agrold-javaweb/.vscode.template/settings.json
@@ -1,7 +1,7 @@
 {
   "maven.terminal.favorites": [
     {
-      "command": "package docker:build docker:start docker:watch",
+      "command": "package docker:start",
       "debug": false,
       "alias": "Run in container"
     }

diff --git a/agrold-javaweb/nbactions.template.xml b/agrold-javaweb/nbactions.template.xml
@@ -9,11 +9,7 @@
             </packagings>
             <goals>
                 <goal>package</goal>
-                <goal>docker:build</goal>
                 <goal>docker:start</goal>
-                <goal>docker:watch</goal>
             </goals>
         </action>
-
-
     </actions>
diff --git a/agrold-javaweb/pom.xml b/agrold-javaweb/pom.xml
@@ -124,6 +124,8 @@
         </dependency>
     </dependencies>
 
+
+
     <build>
         <plugins>
             <plugin>
@@ -183,13 +185,10 @@
                 <version>0.43.4</version>
                 <configuration>
                     <keepContainer>false</keepContainer>
+                    <logDate>default</logDate>
                     <images>
                         <image>
-                            <name>ghcr.io/southgreenplatform/agrold</name>
-                            <build>
-                                <contextDir>${project.basedir}</contextDir>
-                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>
-                            </build>
+                            <name>bitnami/tomcat:9.0</name>
                             <run>
                                 <ports>
                                     <port>8080:8080</port>
@@ -200,6 +199,17 @@
                                     <TOMCAT_PASSWORD>password</TOMCAT_PASSWORD>
                                     <CATALINA_OPTS>${CATALINA_OPTS}</CATALINA_OPTS>
                                 </env>
+                                <volumes>
+                                    <bind>
+                                        <volume>${project.basedir}/target/${agrold.name}:/opt/bitnami/tomcat/webapps_default/${agrold.name}</volume>
+                                    </bind>
+                                </volumes>
+                                <log>
+                                    <enabled>true</enabled>
+                                    <prefix>Agrold @ %a &gt;&#160;</prefix>
+                                    <date>NONE</date>
+                                    <color>CYAN</color>
+                                </log>
                             </run>
                         </image>
                     </images>