X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=74abb1cf608d44a8c6d9bbdd6cf1e2acacf83cf8;hb=e1ca97f1cff72a7ad1b7fe838a3f15a3930d11ae;hp=4019f5c13b72c1a779ea9deddb10279c3c536752;hpb=7faa186d6cbd20f2dfd44b282a4801b0e4546b74;p=aai%2Fdata-router.git

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 4019f5c..74abb1c 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,25 +1,39 @@
-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
+ARG DR_LOGS=/var/log/onap/AAI-DR
 
-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
-ADD swm/package/nix/dist_files/appl/data-router/* $MICRO_HOME/
-RUN mkdir -p $BIN_HOME
-COPY *.sh $BIN_HOME
-RUN chmod 755 $BIN_HOME/*
-RUN ln -s /logs $MICRO_HOME/logs
+# AAI-2176 Additional optional steps for Ubuntu
+RUN if  ((uname -v | grep -i "ubuntu") || ( cat /etc/*release|grep -i "ubuntu")      ) ; then \
+   #####################################
+   #if JAVA doesnt exist then install it: 
+   ######################################
+   if type  java  2>/dev/null; then \ 	
+     echo "skipping java installation"; \  	
+   else \
+     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
+     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
+     JAVA_HOME=usr/lib/jvm/java-8-openjdk-amd64; \
+     export JAVA_HOME ; \
+   fi; \
+fi
+RUN mkdir -p $MICRO_HOME $MICRO_HOME/logs $DR_LOGS
+
+RUN groupadd aaiadmin -g 1000
+RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
+
+WORKDIR $MICRO_HOME
+RUN chown -R aaiadmin:aaiadmin $MICRO_HOME $MICRO_HOME/logs $DR_LOGS
+
+COPY --chown=aaiadmin:aaiadmin /maven/data-router/ .
+
+USER aaiadmin
+
+RUN chmod 755 $BIN_HOME/* \
+    && ln -snf /logs $MICRO_HOME/logs
 
 EXPOSE 9502 9502