From 4480e77eede30a9a3c6edd021d0b237ab68c2c4e Mon Sep 17 00:00:00 2001 From: Dmitry Puzikov Date: Wed, 10 Jul 2019 15:29:08 +0200 Subject: Fix version parsing Change-Id: I7fc5262fac013e76a473bffc913225a4b5bd2779 Issue-ID: INT-1142 Signed-off-by: Dmitry Puzikov (cherry picked from commit 897c9e987e8a2b4343282358b37be34ad68011a4) --- src/main/docker/Dockerfile | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'src/main/docker/Dockerfile') diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index b3d63d7..f96ee9d 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,27 +1,14 @@ -FROM ubuntu:14.04 +FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ ARG MICRO_HOME=/opt/app/spike ARG BIN_HOME=$MICRO_HOME/bin -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 -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 -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 spike.jar $MICRO_HOME/ -RUN mkdir -p $BIN_HOME -COPY *.sh $BIN_HOME -RUN mkdir -p $MICRO_HOME/bundleconfig/etc -COPY bundleconfig-local $MICRO_HOME/bundleconfig -RUN chmod 755 $BIN_HOME/* -RUN ln -s /logs $MICRO_HOME/logs +WORKDIR $MICRO_HOME +COPY /maven/spike . +RUN chmod 755 $BIN_HOME/* \ + && ln -snf /logs $MICRO_HOME/logs EXPOSE 9518 9518 -- cgit 1.2.3-korg