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=501491fb4fb6be9e8f7cb7b998c2004c2f476e58;hb=66db0bdce77076a77cab271ef73ceab999864124;hp=df0ef2d915b1ab80a246d03415e8eaac22de2985;hpb=22318c533945a0f4a2516f0a246262416e35f2a4;p=aai%2Fchamp.git

diff --git a/champ-service/src/main/docker/Dockerfile b/champ-service/src/main/docker/Dockerfile
index df0ef2d..501491f 100644
--- a/champ-service/src/main/docker/Dockerfile
+++ b/champ-service/src/main/docker/Dockerfile
@@ -3,6 +3,33 @@ 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
+#AAI-2175 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