-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
+#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
-ADD swm/package/nix/dist_files/appl/champ-service/* $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
-
-# Create the aai user
-RUN mkdir /opt/aaihome && \
- groupadd -g 492381 aaiadmin && \
- useradd -r -u 341790 -g 492381 -ms /bin/bash -d /opt/aaihome/aaiadmin aaiadmin && \
- chown -R aaiadmin:aaiadmin $MICRO_HOME
-USER aaiadmin
+WORKDIR $MICRO_HOME
+COPY /maven/champ-service/ .
+RUN chmod 755 $BIN_HOME/* \
+ && ln -snf /logs $MICRO_HOME/logs
EXPOSE 9522 9522