diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-18 12:03:09 -0400 |
|---|---|---|
| committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-21 12:48:07 -0400 |
| commit | 4439db95482aadd2818944e9327229cb1a7aed70 (patch) | |
| tree | 2140f2a90585ffd1d5ea605dcf14ed07228cdc09 /installation/ueb-listener | |
| 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/ueb-listener')
| -rw-r--r-- | installation/ueb-listener/pom.xml | 66 |
1 files changed, 19 insertions, 47 deletions
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 61217cdd..3117982d 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -8,9 +8,7 @@ <version>2.1.7-SNAPSHOT</version> </parent> - <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-ueb-listener</artifactId> - <version>2.1.7-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: installation :: ${project.artifactId}</name> @@ -25,17 +23,15 @@ <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> <ccsdk.docker.version>${ccsdk.docker.alpine.j11.version}</ccsdk.docker.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> - <docker.push.phase>deploy</docker.push.phase> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> <build> <plugins> - - <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> <executions> <execution> <phase>validate</phase> @@ -48,9 +44,6 @@ </execution> </executions> </plugin> - - - <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> @@ -74,7 +67,6 @@ </resources> </configuration> </execution> - <execution> <id>copy-scripts</id> <goals> @@ -89,12 +81,11 @@ <includes> <include>*.sh</include> </includes> - <filtering>false</filtering> + <filtering>true</filtering> </resource> </resources> </configuration> </execution> - <execution> <id>copy-properties</id> <goals> @@ -109,12 +100,11 @@ <includes> <include>*</include> </includes> - <filtering>false</filtering> + <filtering>true</filtering> </resource> </resources> </configuration> </execution> - </executions> </plugin> <plugin> @@ -144,34 +134,22 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> <executions> - - - <execution> - <id>change shell permissions</id> + <id>change-shell-permissions</id> <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> - <argument>-name</argument> - <argument>*.sh</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> + <target> + <chmod dir="${basedir}/target/docker-stage/opt/onap/sdnc" perm="+x" includes="**/*.sh"/> + </target> </configuration> + <goals> + <goal>run</goal> + </goals> </execution> </executions> </plugin> @@ -186,7 +164,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> <images> @@ -194,7 +172,8 @@ <name>${image.name}</name> <build> <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <noCache>true</noCache> + <contextDir>${basedir}/target/docker-stage</contextDir> <dockerFile>Dockerfile</dockerFile> <tags> <tag>${project.docker.latestminortag.version}</tag> @@ -204,19 +183,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>deploy</phase> --> + <id>build-push-images</id> <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> |