X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cdt%2Fpom.xml;h=7ac1a65cad8c9f1d8d4f379291a94e2f9154dfa2;hb=8c46a7fb13b52f1b0d2fe0cc27787a5df209e285;hp=0c541fb3d8cd255e999e727a02f3d503433a1cd3;hpb=b4b8bc4aad8ee127344277c800d5a2de88237555;p=appc%2Fdeployment.git

diff --git a/cdt/pom.xml b/cdt/pom.xml
index 0c541fb..7ac1a65 100644
--- a/cdt/pom.xml
+++ b/cdt/pom.xml
@@ -27,22 +27,22 @@ limitations under the License.
     <parent>
         <groupId>org.onap.appc.deployment</groupId>
         <artifactId>appc-docker-project</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.appc.deployment</groupId>
     <artifactId>installation-cdt</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>Installation - CDT Docker</name>
     <description>Creates APPC CDT Docker container</description>
 
     <properties>
         <image.name>onap/appc-cdt-image</image.name>
-        <appc.release.version>1.6.0</appc.release.version>
-        <appc.snapshot.version>1.6.0-SNAPSHOT</appc.snapshot.version>
+        <appc.release.version>1.7.0</appc.release.version>
+        <appc.snapshot.version>1.7.0-SNAPSHOT</appc.snapshot.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>
@@ -77,15 +77,14 @@ limitations under the License.
                             </resources>
                         </configuration>
                     </execution>
-
-                    <!--<execution>
+                    <execution>
                         <id>copy-scripts</id>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/bin</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/scripts</directory>
@@ -96,8 +95,45 @@ limitations under the License.
                                 </resource>
                             </resources>
                         </configuration>
-                    </execution> -->
-                    
+                    </execution>
+                    <execution>
+                        <id>copy-resources</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>nginx.conf</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-certs</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/cert</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/cert</directory>
+                                    <includes>
+                                        <include>*.pem</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -157,7 +193,7 @@ limitations under the License.
                                         }
                                         if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
                                         project.properties['dockertag1']=project.properties['ver'] + "-latest";
-                                        project.properties['dockertag2']="latest";
+                                        project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
                                         project.properties['appc.version']=project.properties['appc.snapshot.version'];
                                         } else {
                                         project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
@@ -174,7 +210,7 @@ limitations under the License.
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.16.5</version>
+                        <version>0.28.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -183,7 +219,7 @@ limitations under the License.
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${dockertag1}</tag>
                                             <tag>${dockertag2}</tag>
@@ -237,6 +273,25 @@ limitations under the License.
                                     </resources>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>copy-scripts</id>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <phase>validate</phase>
+                                <configuration>
+                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>src/main/scripts</directory>
+                                            <includes>
+                                                <include>*.sh</include>
+                                            </includes>
+                                            <filtering>false</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
                     <plugin>