<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.3.3-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc-web</artifactId>
- <version>2.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates SDN Controller WebUI Docker container</description>
<properties>
- <base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo>
+ <base.image.repo>docker.io/bitnami/nginx:1.21-debian-10</base.image.repo>
<image.name>onap/sdnc-web-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
- <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
- <docker.push.phase>deploy</docker.push.phase>
- <docker.verbose>true</docker.verbose>
</properties>
<dependencies>
<id>copy-dockerfile</id>
<goals>
<goal>copy-resources</goal>
- </goals> <!-- here the phase you need -->
+ </goals>
<phase>validate</phase>
<configuration>
<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
<id>copy-siteconf</id>
<goals>
<goal>copy-resources</goal>
- </goals> <!-- here the phase you need -->
+ </goals>
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/conf</outputDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>*.conf</include>
+ <include>*.rules</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
-
<execution>
<id>copy-scripts</id>
<goals>
<goal>copy-resources</goal>
- </goals> <!-- here the phase you need -->
+ </goals>
<phase>validate</phase>
<configuration>
<outputDirectory>${basedir}/target/docker-stage/bin</outputDirectory>
<directory>src/main/scripts</directory>
<includes>
<include>*.sh</include>
+ <include>*.py</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
+ <execution>
+ <id>copy-favicon</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>${basedir}/target/docker-stage/html</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>favicon.ico</include>
+ <include>odlux.application.list</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
<configuration>
<images>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
</build>
</image>
</images>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>push-images</id>
- <phase>${docker.push.phase}</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>