summaryrefslogtreecommitdiffstats
path: root/odlsli/odlsli-alpine/src/main/docker
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-09-01 18:29:00 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-01 18:29:00 +0000
commit884302ca87b0544c885d4eb7a95eab3a9593483d (patch)
treeae47172781f33804f496edcfcabca6cdd4d1f56f /odlsli/odlsli-alpine/src/main/docker
parentec8f9a31c2791974ed82cee03834308a0e36ace6 (diff)
parent1a75e4824ab39c493f405d8791dc62999b273f94 (diff)
Merge "fix odlsli image for new base image"
Diffstat (limited to 'odlsli/odlsli-alpine/src/main/docker')
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile9
1 files changed, 1 insertions, 8 deletions
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 892260d1..ea6f41f7 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -2,9 +2,6 @@
## START OF STAGE0 ##
FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight
-
# copy the opendaylight credentials
COPY idmlight.db.mv.db $ODL_HOME/data
@@ -17,13 +14,10 @@ COPY opt /opt
COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg
## END OF STAGE0 ##
-
FROM ${base.image.name}:${project.docker.latestfulltag.version}
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)"
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight
ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
ENV CCSDKFEATUREVERSION ${ccsdk.features.version}
ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features
@@ -56,4 +50,3 @@ RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_H
USER odl
ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh
-EXPOSE 8181