X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2FDockerfile.hello;h=2378bae0d8f9b00005c9def4ccda6f7b194237de;hb=5b77b6489dfb644a901e2640615a32d78f533351;hp=2002822a2ed57e14260f34bde23a60b1988b7f10;hpb=0e302ed774f4c371b9414fe99836836f775b688d;p=aaf%2Fauthz.git diff --git a/auth/docker/Dockerfile.hello b/auth/docker/Dockerfile.hello index 2002822a..2378bae0 100644 --- a/auth/docker/Dockerfile.hello +++ b/auth/docker/Dockerfile.hello @@ -17,7 +17,7 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM ${DOCKER_REPOSITORY}/onap/aaf/aaf_core:${AAF_VERSION} +FROM ${DOCKER_REPOSITORY}/onap/aaf/aaf_base:${AAF_VERSION} MAINTAINER AAF Team, AT&T 2018 ENV VERSION=${AAF_VERSION} @@ -25,11 +25,16 @@ LABEL description="aaf_hello" LABEL version=${AAF_VERSION} COPY bin/pod_wait.sh /opt/app/aaf/bin/ +COPY lib /opt/app/aaf/lib COPY etc /opt/app/osaaf/etc -RUN 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 +COPY bin/hello /opt/app/aaf/bin/ + +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 CMD []