X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2FDockerfile.config;h=3d9aa352fa7c3ee2ab94b69448ebab82589e4ac7;hb=96bf6a2771dfe992fb27bd6361d191d83b6ff605;hp=d1b6b237a95c8d59753d385cf2deb3a71a6c8d05;hpb=12414fe43077e12d7ef711951b1633ad31d73573;p=aaf%2Fauthz.git

diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config
index d1b6b237..3d9aa352 100644
--- a/auth/docker/Dockerfile.config
+++ b/auth/docker/Dockerfile.config
@@ -18,7 +18,6 @@
 #  ============LICENSE_END====================================================
 #
 FROM ${DOCKER_REPOSITORY}/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}
 
@@ -28,14 +27,25 @@ LABEL version=${AAF_VERSION}
 COPY data/sample.identities.dat /opt/app/aaf_config/data/
 COPY etc /opt/app/aaf_config/etc
 COPY local /opt/app/aaf_config/local
+COPY logs /opt/app/aaf_config/logs
 COPY cert /opt/app/aaf_config/cert
 COPY public /opt/app/aaf_config/public
 COPY CA /opt/app/aaf_config/CA
-COPY logs /opt/app/aaf_config/logs
 COPY bin/service.sh /opt/app/aaf_config/bin/agent.sh
-COPY bin/pod_wait.sh /opt/app/aaf_config/bin/
-COPY bin/aaf-auth-cmd-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
+COPY bin/pod_wait.sh /opt/app/aaf_config/bin/pod_wait.sh
+COPY bin/aaf-auth-cmd-${JAR_VERSION}-full.jar /opt/app/aaf_config/bin/
+COPY bin/aaf-auth-batch-${JAR_VERSION}-full.jar /opt/app/aaf_config/bin/
+
+RUN mkdir -p /opt/app/aaf /opt/app/osaaf/logs && \
+    if [ -n "${DUSER}" ]; then \
+      addgroup ${DUSER} && adduser ${DUSER} -G ${DUSER} -D -s /bin/bash; \
+      chown -R ${DUSER}:${DUSER} /opt/app/aaf /opt/app/osaaf /opt/app/aaf_config; \
+    fi && \
+    chmod 774 /opt/app/aaf_config/bin/*.sh
  
 CMD ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"]
-#CMD ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"]
-CMD []
+# Note: User added if in d.props
+#    if [ -n "${DUSER}" ]; then \
+#      addgroup ${DUSER} && adduser ${DUSER} -G ${DUSER} -D -s /bin/bash; \
+#      chown -R ${DUSER}:${DUSER} /opt/app/aaf /opt/app/aaf_config; \
+#    fi && \