Merge "JAXBData.java-Extract the assignment out of expression"

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

diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config
index d1b6b23..4bb7a94 100644 (file)
--- 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,17 @@ 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/osaaf &&\
+    chmod 755 /opt/app/aaf_config/bin/*.sh &&\
+    if [ -n "${DUSER}" ]; then chown ${DUSER}:${DUSER} /opt/app/osaaf && chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi
+
 CMD ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"]
-#CMD ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"]
-CMD []