Merge "{feature}-installer.zip not copied to docker image"

[appc/deployment.git] / installation / appc / pom.xml

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index 5a0e552..4a6ad79 100644 (file)
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -18,8 +18,12 @@
        <description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
 
        <properties>
-               <image.name>ecomp/appc-image</image.name>
+               <image.name>openecomp/appc-image</image.name>
                <appc.version>${project.version}</appc.version>
+                <!--This version will be over-ridden by jenkins 
+                    injecting the version.properties variable file during docker build-->
+               <appc.docker.staging.version>1.0.0</appc.docker.staging.version>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
        </properties>
 
 
@@ -135,6 +139,7 @@
                        <plugin>
                                <artifactId>exec-maven-plugin</artifactId>
                                <groupId>org.codehaus.mojo</groupId>
+                               <version>1.5.0</version>
                                <executions>
                                        <execution>
                                                <id>Get features</id>
@@ -200,7 +205,7 @@
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                                                                <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
                                                                                <tags>
-                                                                                       <tag>${project.version}</tag>
+                                                                                       <tag>${appc.docker.staging.version}-STAGING-${maven.build.timestamp}</tag>
                                                                                        <tag>latest</tag> 
                                                                                </tags>
                                                                        </build>
@@ -310,6 +315,7 @@
                                        <plugin>
                                                <artifactId>exec-maven-plugin</artifactId>
                                                <groupId>org.codehaus.mojo</groupId>
+                                               <version>1.5.0</version>
                                                <executions>
                                                        <execution>
                                                                <id>Get features</id>