<parent>
<groupId>org.onap.appc.deployment</groupId>
<artifactId>appc-docker-project</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.7.1-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.1-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.1-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>
</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>
</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>
}
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";
<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>
<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>
</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>