diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2021-06-07 20:02:32 +0000 |
|---|---|---|
| committer |   KAPIL SINGAL <ks220y@att.com> | 2021-06-22 16:50:48 +0000 |
| commit | 55378e7480442b8cee46d215a85e194c56b38f36 (patch) | |
| tree | 991ff17070697c5cfef7306b3f195ed1b258a236 /installation/sdnc-web | |
| parent | b20349a92894af9b948c8bf2b5c67c5bd86f9da5 (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: 866ddebbcac80c38c79c46bb37373123a0c678f0
Diffstat (limited to 'installation/sdnc-web')
| -rw-r--r-- | installation/sdnc-web/pom.xml | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 5da89768..135b62ca 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -8,9 +8,7 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-sdnc-web</artifactId> - <version>2.2.0-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,18 +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> - <phase>${docker.push.phase}</phase> + <id>build-push-images</id> <goals> <goal>build</goal> <goal>push</goal> |