summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2021-06-18 11:23:23 -0400
committerKAPIL SINGAL <ks220y@att.com>2021-06-18 15:45:22 +0000
commiteb5b12c7ce09506af6923c1c7bb58dc060514a37 (patch)
tree38d1b3b21071edd3250875d9477ac6b5fe3e757f
parent49a797066db08ce655bd74f86c28dbd2974be301 (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.xml2
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile1
2 files changed, 2 insertions, 1 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 9f6a986b..aa96b8a8 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -516,7 +516,7 @@
<version>1.8</version>
<executions>
<execution>
- <id>change shell permissions</id>
+ <id>change-shell-permissions</id>
<phase>process-sources</phase>
<configuration>
<target>
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}