diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-18 11:23:23 -0400 |
|---|---|---|
| committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-18 11:23:23 -0400 |
| commit | 79f987d26bc08412c09141a6bf833f2bdb0b02c2 (patch) | |
| tree | fa049a0f64b39df9318d6384a7a3dce8364ba60a | |
| parent | 24e1714f43013306c64491722811b01ad7c13c0e (diff) | |
Replacing maven-exec-plugin with maven-antrun-plugin
Adding docker.skip.run property which can be used to skip docker run during merge/stage jenkins run
Adding PATH to have JAVA_HOME added
Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Iabc4132f7022c265a98cd6c39dc30d075772ff42
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 29 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 1 | ||||
| -rw-r--r-- | pom.xml | 1 |
3 files changed, 13 insertions, 18 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 348c1803..b44759c1 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -503,29 +503,21 @@ </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/ccsdk</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/ccsdk" perm="+x" includes="**/*.sh"/> + </target> </configuration> + <goals> + <goal>run</goal> + </goals> </execution> </executions> </plugin> @@ -599,6 +591,7 @@ </image> </images> <verbose>${docker.verbose}</verbose> + <skipRun>${docker.skip.run}</skipRun> <skipPush>${docker.skip.push}</skipPush> </configuration> <executions> diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index 0b6dbbf7..be93e531 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -56,6 +56,7 @@ LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" USER root ENV JAVA_HOME /opt/java/openjdk +ENV PATH ${JAVA_HOME}/bin:$PATH ENV ODL_HOME /opt/opendaylight/current ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties ENV ANSIBLE_GPG_KEY ${ansible.gpg.key} @@ -38,6 +38,7 @@ <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <build.number>${maven.build.timestamp}</build.number> + <docker.skip.run>false</docker.skip.run> <docker.skip.push>false</docker.skip.push> <docker.verbose>true</docker.verbose> |