diff options
author | 2021-06-18 12:03:09 -0400 | |
---|---|---|
committer | 2021-06-21 12:48:07 -0400 | |
commit | 4439db95482aadd2818944e9327229cb1a7aed70 (patch) | |
tree | 2140f2a90585ffd1d5ea605dcf14ed07228cdc09 /installation/sdnc-web/pom.xml | |
parent | 65cb0a032cf45d35ae07244752600cecc8eb930d (diff) |
Effort to reduce image layer and size
Removing few ENV version variable and those should be read
from pom properties (maven-resource-plugin filtering true)
Combined Dockerfile and Standalone.Dockerfile
Adding Docker build arg AAF which will decide whether to add
aaa-app-config.xml in docker image or not for standalone
Updated docker-maven-plugin to 0.34.0 to have noCache true
Removing start-it-container execution as it's being tested by CSIT
Replacing maven-exec-plugin with maven-antrun-plugin
Updating latest base docker images versions
Updating parent version to 2.1.7
Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I68f8f4780804a2014b73b5eeb9dba29d1896a602
Former-commit-id: 4e674166ebefa6c8d9d929cc279ef175191f137b
Diffstat (limited to 'installation/sdnc-web/pom.xml')
-rw-r--r-- | installation/sdnc-web/pom.xml | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 15f9cb9c..4d9045c1 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -8,9 +8,7 @@ <version>2.1.7-SNAPSHOT</version> </parent> - <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-sdnc-web</artifactId> - <version>2.1.7-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: installation :: ${project.artifactId}</name> @@ -23,8 +21,6 @@ <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> @@ -142,7 +138,7 @@ <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> @@ -150,8 +146,9 @@ <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> @@ -160,17 +157,12 @@ </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> + <id>build-push-images</id> <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> |