[UI] Embed files inside image

[validation.git] / ui / pom.xml

diff --git a/ui/pom.xml b/ui/pom.xml
index f3f0c97..281781e 100644 (file)
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>org.akraino.validation</groupId>
     <artifactId>ui</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.4.5-SNAPSHOT</version>
     <name>Bluval UI Maven Webapp</name>
     <packaging>war</packaging>
 
@@ -52,6 +52,7 @@
         <tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin</tomcat.download.path>
         <tomcat.download.name>apache-tomcat-8.0.37</tomcat.download.name>
         <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
+        <mysql-connector.version>8.0.17</mysql-connector.version>
     </properties>
 
     <repositories>
@@ -158,19 +159,19 @@
                             <build>
                                 <from>tomcat:8.5.37</from>
                                 <assembly>
-                                    <descriptorRef>artifact</descriptorRef>
+                                    <descriptor>${project.basedir}/ui-docker-assembly.xml</descriptor>
                                 </assembly>
                                 <runCmds>
                                     <!-- must be all on one line; use CDATA
                                         to turn off the Eclipse formatter -->
-                                    <run><![CDATA[mv /maven/*.war /usr/local/tomcat/webapps]]></run>
+                                    <run><![CDATA[mv /maven/target/*.war /usr/local/tomcat/webapps; mv /maven/docker-files/index.jsp /usr/local/tomcat/webapps/ROOT; mv /maven/docker-files/server.xml /usr/local/tomcat/conf; rm -fr /maven]]></run>
                                 </runCmds>
                             </build>
                         </image>
                         <image>
-                            <name>akraino/validation:dev-mariadb-latest</name>
+                            <name>akraino/validation:dev-mysql-latest</name>
                             <build>
-                                <from>mariadb:10.4.6</from>
+                                <from>mysql:5.6</from>ll
                                 <assembly>
                                     <descriptorRef>project</descriptorRef>
                                 </assembly>
@@ -373,5 +374,11 @@
             <artifactId>commons-httpclient</artifactId>
             <version>${commons-httpclient.version}</version>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector.version}</version>
+        </dependency>
+
     </dependencies>
 </project>