copy war file in Docker image

Add build argument in POM to set the ARG used in Dockerfile.

Issue-ID: CCSDK-1011
Change-Id: Ie8181b8bf19770e39a8358149a29e9bfc5ce1a86
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>

diff --git a/ccsdk-app-os/Dockerfile b/ccsdk-app-os/Dockerfile
index dc49492..81f3cb3 100644 (file)
--- a/ccsdk-app-os/Dockerfile
+++ b/ccsdk-app-os/Dockerfile
@@ -35,4 +35,4 @@ RUN dos2unix /tmp/docker-dashboard-installation.sh
 RUN chmod +x /tmp/create_table.sql
 RUN chmod +x /tmp/docker-dashboard-installation.sh
 
-CMD ["/tmp/docker-dashboard-installation.sh"]
\ No newline at end of file
+CMD ["/tmp/docker-dashboard-installation.sh"]

diff --git a/ccsdk-app-os/docker-dashboard-installation.sh b/ccsdk-app-os/docker-dashboard-installation.sh
index 75aa8a0..4c35510 100644 (file)
--- a/ccsdk-app-os/docker-dashboard-installation.sh
+++ b/ccsdk-app-os/docker-dashboard-installation.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Unzip the dashboard war file
-unzip -qq -d /home/deployments/ccsdk-app /home/deployments/ccsdk-app.war
+unzip -qq -d /home/deployments/ccsdk-app /home/deployments/ccsdk-app*.war
 
 # Delete the dashboard war file
-rm -f /home/deployments/ccsdk-app.war
+rm -f /home/deployments/ccsdk-app*.war
 
 # Update dashboard.properties
 cat /home/deployments/ccsdk-app/WEB-INF/conf/dashboard.properties | \

diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml
index 242c682..1c8c5b0 100644 (file)
--- a/ccsdk-app-os/pom.xml
+++ b/ccsdk-app-os/pom.xml
@@ -38,6 +38,7 @@
                <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <docker.verbose>true</docker.verbose>
+               <docker.buildArg.WAR_FILE>${project.build.finalName}.war</docker.buildArg.WAR_FILE>
        </properties>