X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=f96ee9de2ee985f5044caa8d1e870364ba2d3a2c;hb=4480e77eede30a9a3c6edd021d0b237ab68c2c4e;hp=b3d63d7da4ab7d8e02e99affb8cd86def5dc1701;hpb=d48bf737fd34d5548061a3cfeb60b54d5ccafcfd;p=aai%2Fspike.git

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