Merge "SonarFix"

[aaf/authz.git] / auth / docker / Dockerfile.core

diff --git a/auth/docker/Dockerfile.core b/auth/docker/Dockerfile.core
index 3431ee2..5c66c8c 100644 (file)
--- 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/osaaf &&\
+    mkdir -p /opt/app/aaf/status &&\
+    chmod 755 /opt/app/aaf/bin/* &&\
+    if [ -n "${DUSER}" ]; then  chown ${DUSER}:${DUSER} /opt/app/aaf/status \
+      && chown ${DUSER}:${DUSER} /opt/app/osaaf \
+      && chown -R ${DUSER}:${DUSER} /opt/app/aaf;\
+    fi