X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2FDockerfile.config;h=4bb7a940366b759de16e123b56b7e6de54c31314;hb=cd2cc4e3123fcaa9a172702b69c6441067d369a1;hp=7e442b2a3be6b0e95a947a97fe463fb20a0c30c5;hpb=2b5103e038a7727734097a671d331db9aaab77ba;p=aaf%2Fauthz.git diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config index 7e442b2a..4bb7a940 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} @@ -33,11 +32,12 @@ COPY cert /opt/app/aaf_config/cert COPY public /opt/app/aaf_config/public COPY CA /opt/app/aaf_config/CA 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/aaf-auth-batch-${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 -RUN if [ -n "${DUSER}" ]; then chown ${DUSER}:${DUSER} /opt/app/osaaf && chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi +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"]