diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-04-16 16:52:05 +0200 |
|---|---|---|
| committer |   James Forsyth <jf2512@att.com> | 2019-09-03 14:31:58 +0000 |
| commit | 89d3d25d03fabff3f384767e765c644f21d31310 (patch) | |
| tree | 7e53481c6387dc8cf2f1fbdfc3f5827d620fc211 /src/main/docker | |
| parent | df88554407c10138a43453dff6f0d0392c5666c7 (diff) | |
Fixed version parsing
Change-Id: Ibd37f998820dd4a77a6c320ce6b1066b06c86f51
Issue-ID: INT-798
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
(cherry picked from commit 86359a2f445a19a19d8239f2e7e07480a1bc7ba3)
Diffstat (limited to 'src/main/docker')
| -rw-r--r-- | src/main/docker/Dockerfile | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index db67dd9..a523778 100644 --- 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"] |