diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-07-10 15:29:08 +0200 |
|---|---|---|
| committer |   James Forsyth <jf2512@att.com> | 2019-09-03 14:56:13 +0000 |
| commit | 4480e77eede30a9a3c6edd021d0b237ab68c2c4e (patch) | |
| tree | 39ffb1aa055cfd62d7cf6df40518f8adddc3777c /src/main/docker/Dockerfile | |
| parent | d48bf737fd34d5548061a3cfeb60b54d5ccafcfd (diff) | |
Fix version parsing5.1.0-ONAP5.0.1-ONAPelalto
Change-Id: I7fc5262fac013e76a473bffc913225a4b5bd2779
Issue-ID: INT-1142
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
(cherry picked from commit 897c9e987e8a2b4343282358b37be34ad68011a4)
Diffstat (limited to 'src/main/docker/Dockerfile')
| -rw-r--r-- | src/main/docker/Dockerfile | 23 |
1 files changed, 5 insertions, 18 deletions
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 |