From: James Forsyth <jf2512@att.com>
Date: Tue, 16 Jun 2020 13:13:11 +0000 (+0000)
Subject: Merge "Added William Reehil as committer"
X-Git-Tag: 1.7.0~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fmodel-loader.git;a=commitdiff_plain;h=ff129f1146817e34f0580b596c242fe74ea22e25;hp=df2807e2b239709d42baf94913e2374ff38b1b35

Merge "Added William Reehil as committer"
---

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index a523778..a4da9af 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -3,9 +3,18 @@ FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 ARG MICRO_HOME=/opt/app/model-loader
 
 # Build up the deployment folder structure
-RUN mkdir -p $MICRO_HOME
+RUN mkdir -p $MICRO_HOME $MICRO_HOME/logs
+
+RUN groupadd aaiadmin -g 1000
+RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
 WORKDIR $MICRO_HOME
-COPY /maven/model-loader/ .
+
+RUN chown -R aaiadmin:aaiadmin $MICRO_HOME $MICRO_HOME/logs
+
+COPY --chown=aaiadmin:aaiadmin /maven/model-loader/ .
+
+USER aaiadmin
+
 RUN chmod 755 bin/* \
     && ln -s /logs $MICRO_HOME/logs