X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2FDockerfile.core;h=5c66c8caa0f4d553f1e9a82f93a87dba199eddb1;hb=HEAD;hp=3431ee25b38fa3a8ee7a9ebab8688f27153bb4b5;hpb=7a1817bf3cf3c40c6c33f673ddc46c3f115cc3bc;p=aaf%2Fauthz.git

diff --git a/auth/docker/Dockerfile.core b/auth/docker/Dockerfile.core
index 3431ee25..206d1c4d 100644
--- a/auth/docker/Dockerfile.core
+++ b/auth/docker/Dockerfile.core
@@ -17,7 +17,9 @@
 #  limitations under the License.
 #  ============LICENSE_END====================================================
 #
-FROM nexus3.onap.org:10001/onap/aaf/aaf-base-xenial:latest
+FROM ${DOCKER_REPOSITORY}/onap/aaf/aaf_base:${AAF_VERSION}
+#FROM nexus3.onap.org:10001/onap/aaf/aaf_base:${AAF_VERSION}
+#FROM nexus3.onap.org:10001/onap/aaf/aaf-base-xenial:latest
 MAINTAINER AAF Team, AT&T 2018
 ENV VERSION=${AAF_VERSION}
 
@@ -26,6 +28,13 @@ LABEL version=${AAF_VERSION}
 
 COPY lib /opt/app/aaf/lib
 COPY bin /opt/app/aaf/bin
-COPY theme /opt/app/aaf/theme
+COPY theme/ /opt/app/aaf/theme/
 
+RUN mkdir -p /opt/app/aaf && \
+    if [ -n "${DUSER}" ]; then \
+      addgroup ${DUSER} && adduser ${DUSER} -G ${DUSER} -D -s /bin/bash ;\
+      chown -R ${DUSER}:${DUSER} /opt/app/aaf ;\
+      chmod 774 /opt/app/aaf/bin/* ;\
+    fi
 
+# Note: User added if in d.props