diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-07-17 16:07:57 +0200 |
|---|---|---|
| committer | Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-08-29 12:11:01 +0200 |
| commit | 7ea1df80bf0c87800ff737a6b3e29af689bb003f (patch) | |
| tree | 8c8d721e572c06ac618907f724ad69e218471780 /src/main/docker | |
| parent | 5f8a8eed09b22bf9f849607e743ae1fe57433eb1 (diff) | |
Fixed project version parsing
Change-Id: I7f5f7ab3d9b3ff58b248652f41efc620d779e6e4
Issue-ID: INT-1149
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Diffstat (limited to 'src/main/docker')
| -rw-r--r-- | src/main/docker/Dockerfile | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 00827e3..7342a64 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,34 +1,13 @@ -FROM ubuntu:14.04 +FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ ARG MICRO_HOME=/opt/app/data-router 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 -RUN mkdir -p $BIN_HOME -RUN mkdir -p $MICRO_HOME/bundleconfig -RUN mkdir -p $MICRO_HOME/bundleconfig/etc -RUN mkdir -p $MICRO_HOME/BOOT-INF/lib -COPY start.sh $MICRO_HOME/bin/ -RUN chmod 755 $BIN_HOME/* -RUN ln -s /logs $MICRO_HOME/logs -ENV MICRO_HOME ${MICRO_HOME} -ENV CONFIG_HOME=${CONFIG_HOME} -COPY data-router.jar $MICRO_HOME/ -COPY bundleconfig-local $MICRO_HOME/bundleconfig -COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc -COPY oxm $MICRO_HOME/ - +WORKDIR $MICRO_HOME +COPY /maven/data-router/ . +RUN chmod 755 $BIN_HOME/* \ + && ln -snf /logs $MICRO_HOME/logs EXPOSE 9502 9502 |