summaryrefslogtreecommitdiffstats
path: root/src/main/docker
diff options
context:
space:
mode:
authormark.j.leonard <mark.j.leonard@gmail.com>2018-04-26 16:53:12 +0100
committermark.j.leonard <mark.j.leonard@gmail.com>2018-04-26 16:53:50 +0100
commit6e4f04afea4c2d07fdd9c15eda38438c7baeb308 (patch)
tree8fd7e14ff590adb16f5b49221b3a7b901fd1fa4c /src/main/docker
parent3a1f764b762a91e917e9e14a00c4a7ff3c4e0745 (diff)
Convert project from AJSC to Spring Boot
Remove all AJSC configuration and dependencies. Update the pom.xml to use oparent and to depend on Spring Boot. Refactor the main class to introduce a minimal set of Spring annotations. Note that the license text was corrected in this change. Issue-ID: AAI-1039 Change-Id: I16385db3216ec39bfd2881f2278e340ec3795199 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Diffstat (limited to 'src/main/docker')
-rw-r--r--src/main/docker/Dockerfile8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 9aafdda..db67dd9 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -2,20 +2,22 @@ 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/*