X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2FDockerfile.hello;h=e8a605661f9e8ac401cc82b0a6549c7239de9287;hb=0d982409d8931d92e62c88414ece2c48ab5e4b52;hp=2002822a2ed57e14260f34bde23a60b1988b7f10;hpb=fea400a6e11a41e39911927edf37938b5d13f181;p=aaf%2Fauthz.git

diff --git a/auth/docker/Dockerfile.hello b/auth/docker/Dockerfile.hello
index 2002822a..e8a60566 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,18 @@ LABEL description="aaf_hello"
 LABEL version=${AAF_VERSION}
  
 COPY bin/pod_wait.sh /opt/app/aaf/bin/
+COPY lib /opt/app/aaf/lib
+COPY bin/hello /opt/app/aaf/bin/
 COPY etc /opt/app/osaaf/etc
-RUN mkdir -p /opt/app/aaf/status && chmod 755 /opt/app/aaf/bin/* &&\
+COPY logs /opt/app/osaaf/logs
+
+RUN mkdir -p /opt/app/aaf /opt/app/osaaf/logs/hello /opt/app/osaaf/local && \
     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
+      addgroup ${DUSER} && adduser ${DUSER} -G ${DUSER} -D -s /bin/bash ;\
+      chown -R ${DUSER}:${DUSER} /opt/app/aaf /opt/app/osaaf;\
+      chmod 774 /opt/app/aaf/bin/* ;\
+    fi
 
 CMD []
+
+# Note: User added if in d.props