X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=a4da9afb18c8dd1bf68008bcb95352a6b9b14038;hb=2cdc6af6738193d052993f0991cba2db055d0cf5;hp=6f187d595a6b66dd655480d3a41b540dbc7cecf9;hpb=578368fce559ad28eb3bc62064e4c39858fa3339;p=aai%2Fmodel-loader.git

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 6f187d5..a4da9af 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,24 +1,21 @@
-FROM ubuntu:14.04
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
 ARG MICRO_HOME=/opt/app/model-loader
-ARG BIN_HOME=$MICRO_HOME/bin
 
-RUN apt-get update
+# Build up the deployment folder structure
+RUN mkdir -p $MICRO_HOME $MICRO_HOME/logs
 
-# Install and setup java8
-RUN apt-get update && apt-get install -y software-properties-common
-## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step
-RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
-## Setup JAVA_HOME, this is useful for docker commandline
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
-RUN export JAVA_HOME
+RUN groupadd aaiadmin -g 1000
+RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
+WORKDIR $MICRO_HOME
 
-# Build up the deployment folder structure
-RUN mkdir -p $MICRO_HOME
-ADD swm/package/nix/dist_files/appl/model-loader/* $MICRO_HOME/
-RUN mkdir -p $BIN_HOME
-COPY *.sh $BIN_HOME
-RUN chmod 755 $BIN_HOME/*
-RUN ln -s /logs $MICRO_HOME/logs
-
-CMD /opt/app/model-loader/bin/start.sh
+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
+
+CMD ["/opt/app/model-loader/bin/start.sh"]