X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=search-data-service-app%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=45ef1854eaa02e4b988d89c3e07d657758a6334c;hb=fd99e5e88692192a996df4295bcf79cfc3b5c723;hp=1a70fd7be965513c5b9c3d6b85f225a5ccc126a8;hpb=57ccc376054d09367dc4bf8855adea1f19a87b3f;p=aai%2Fsearch-data-service.git

diff --git a/search-data-service-app/src/main/docker/Dockerfile b/search-data-service-app/src/main/docker/Dockerfile
index 1a70fd7..45ef185 100644
--- a/search-data-service-app/src/main/docker/Dockerfile
+++ b/search-data-service-app/src/main/docker/Dockerfile
@@ -1,26 +1,44 @@
-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
+#AAI-2179 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; \
+   ##########################################
+   #Install gosu if not present
+   ##########################################
+   if type  gosu   2>/dev/null; then \
+     echo "skipping gosu installation"; \
+   else \
+     set -x ; \
+     add-apt-repository -y ppa:tianon/gosu; \
+     sudo apt-get update; \
+     sudo apt-get install gosu; \
+   fi;\
+fi
 
 # Build up the deployment folder structure
-RUN mkdir -p $MICRO_HOME
+RUN mkdir -p $MICRO_HOME $USERS_HOME /logs
+WORKDIR $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
+# copy everything from search-data-service-app/target/docker/nexus3.onap.org/10003/onap/search-data-service/latest/build/maven/search-data-service-app
+COPY /maven/search-data-service-app/ .
+RUN chmod -R 755 $BIN_HOME/* $MICRO_HOME/*
+RUN ln -snf /logs $MICRO_HOME/logs
 
 EXPOSE 9509 9509