X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=10bc3e61e86922cc4224784326cdc9d04a650a2b;hb=refs%2Fchanges%2F29%2F118429%2F3;hp=db67dd916ce9c6bef3c2d00a61b8593f62632d3b;hpb=6e4f04afea4c2d07fdd9c15eda38438c7baeb308;p=aai%2Fmodel-loader.git

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index db67dd9..10bc3e6 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,26 +1,18 @@
-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
-ARG JAR_FILE=model-loader.jar
 
-RUN apt-get update
+WORKDIR $MICRO_HOME
 
-# 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 likely freeze at this step
-RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
-## Set up JAVA_HOME for docker command-line
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
-RUN export JAVA_HOME
+USER root
 
-# Build up the deployment folder structure
-RUN mkdir -p $MICRO_HOME
-COPY ${JAR_FILE} $MICRO_HOME/
-COPY classes/logback.xml $MICRO_HOME/
-RUN mkdir -p $BIN_HOME
-COPY *.sh $BIN_HOME
-RUN chmod 755 $BIN_HOME/*
-RUN ln -s /logs $MICRO_HOME/logs
+RUN mkdir -p /opt/aaihome $MICRO_HOME /logs && \
+    ln -s /logs $MICRO_HOME/logs && \
+    chown -R aaiadmin:aaiadmin $MICRO_HOME && \
+    chown -R aaiadmin:aaiadmin /logs
 
-CMD ["/opt/app/model-loader/bin/start.sh"]
+COPY --chown=aaiadmin:aaiadmin /maven/model-loader/ .
+
+ENTRYPOINT ["/bin/bash", "/opt/app/model-loader/bin/start.sh"]
+
+USER aaiadmin