X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=champ-service%2Fsrc%2Fmain%2Fdocker%2FDockerfile;fp=champ-service%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=df0ef2d915b1ab80a246d03415e8eaac22de2985;hb=9a304415d90b8dca5e319f3a24b1733df3c1d9d3;hp=79791d80746708c592f8c93f338b9f9cf23ea137;hpb=4fe5bfbbffa08870565d02ecbd7c31de8fe4b52c;p=aai%2Fchamp.git

diff --git a/champ-service/src/main/docker/Dockerfile b/champ-service/src/main/docker/Dockerfile
index 79791d8..df0ef2d 100644
--- a/champ-service/src/main/docker/Dockerfile
+++ b/champ-service/src/main/docker/Dockerfile
@@ -1,26 +1,15 @@
-FROM ubuntu:14.04
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
 ARG MICRO_HOME=/opt/app/champ-service
 ARG BIN_HOME=$MICRO_HOME/bin
 ARG GRAPHLIB_HOME=$MICRO_HOME/graph-deps
 
-RUN apt-get update
-
-# Install and setup java8
-RUN apt-get update && apt-get install -y software-properties-common
-RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
-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 champ-service.jar $MICRO_HOME/
-RUN mkdir -p $GRAPHLIB_HOME
-ADD graph-deps $GRAPHLIB_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/champ-service/ .
+RUN chmod 755 $BIN_HOME/* \
+    && ln -snf /logs $MICRO_HOME/logs
 
 EXPOSE 9522 9522