Fixed version parsing

[aai/model-loader.git] / src / main / docker / Dockerfile

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index db67dd9..a523778 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,26 +1,12 @@
-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
-
-# 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
 
 # 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
+WORKDIR $MICRO_HOME
+COPY /maven/model-loader/ .
+RUN chmod 755 bin/* \
+    && ln -s /logs $MICRO_HOME/logs
 
 CMD ["/opt/app/model-loader/bin/start.sh"]