diff options
| author |   Jimmy Forsyth <jf2512@att.com> | 2019-09-05 14:32:27 -0400 |
|---|---|---|
| committer | Jimmy Forsyth <jf2512@att.com> | 2019-09-05 14:33:12 -0400 |
| commit | 2cefa3788c2ab6e4f39d36bf29a7325ff44ee3d1 (patch) | |
| tree | 4594f0a7258d495021be6e343aa8a97de816db51 | |
| parent | 98624347bcadd2056a48b1062869f952959168ab (diff) | |
Fix docker build job
Issue-ID: AAI-2579
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I800a986196da30b771f9a6cd158a407fb7e4cceb
| -rw-r--r-- | search-data-service-app/src/main/docker/Dockerfile | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/search-data-service-app/src/main/docker/Dockerfile b/search-data-service-app/src/main/docker/Dockerfile index 1a70fd7..2d2abce 100644 --- a/search-data-service-app/src/main/docker/Dockerfile +++ b/search-data-service-app/src/main/docker/Dockerfile @@ -1,26 +1,14 @@ -FROM ubuntu:14.04 +FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ ARG MICRO_HOME=/opt/app/search-data-service ARG BIN_HOME=$MICRO_HOME/bin -## 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 $MICRO_HOME/bundleconfig/etc -ADD *.jar $MICRO_HOME/ -RUN mkdir -p $BIN_HOME -COPY *.sh $BIN_HOME -COPY bundleconfig-local $MICRO_HOME/bundleconfig -COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc -RUN chmod 755 $BIN_HOME/* -RUN ln -s /logs $MICRO_HOME/logs +RUN mkdir -p $MICRO_HOME $USERS_HOME /logs +WORKDIR $MICRO_HOME +COPY /maven/@project.artifactId@/ . +RUN chmod 755 $BIN_HOME/* \ + && ln -snf /logs $MICRO_HOME/logs EXPOSE 9509 9509 |