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

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 6f187d5..db67dd9 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -2,23 +2,25 @@ FROM ubuntu:14.04
 
 ARG MICRO_HOME=/opt/app/model-loader
 ARG BIN_HOME=$MICRO_HOME/bin
+ARG JAR_FILE=model-loader.jar
 
 RUN apt-get update
 
 # 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
+## 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
-## Setup JAVA_HOME, this is useful for docker commandline
+## Set up JAVA_HOME for docker command-line
 ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
 RUN export JAVA_HOME
 
 # Build up the deployment folder structure
 RUN mkdir -p $MICRO_HOME
-ADD swm/package/nix/dist_files/appl/model-loader/* $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
 
-CMD /opt/app/model-loader/bin/start.sh
+CMD ["/opt/app/model-loader/bin/start.sh"]