summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-09-04 13:02:08 -0400
committerDan Timoney <dtimoney@att.com>2020-09-04 13:02:08 -0400
commit23b00b376a00249521a8728cfb9ecd8f2b945ff1 (patch)
tree7454c051cc43877126488e9e71793b20672a55a1
parent82fab515b893584a4aa64f65e3e54ffca8bdd596 (diff)
Fix errors in odlsli Dockerfile
Fix errors in odlsli Dockerfile introduced by port to common ONAP base image Change-Id: I7593a5b93ada0b6215d38536dda14ef0f0fbca26 Issue-ID: CCSDK-2418 Signed-off-by: Dan Timoney <dtimoney@att.com>
-rwxr-xr-x.gitignore1
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile3
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 91f026b3..4ca286c2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ org.eclipse.core.resources.prefs
.checkstyle
maven-eclipse.xml
workspace
+.vscode
## Compilation Files ##
*.class
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index cca71f6d..e8fa5ef6 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -3,7 +3,7 @@
FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0
# copy the opendaylight credentials
-USER ROOT
+USER root
COPY idmlight.db.mv.db $ODL_HOME/data
# copy CCSDK mvn artifacts to ODL repository
@@ -18,6 +18,7 @@ COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg
FROM ${base.image.name}:${project.docker.latestfulltag.version}
LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)"
+USER root
ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
ENV CCSDKFEATUREVERSION ${ccsdk.features.version}