ARG MICRO_HOME=/opt/app/search-data-service
ARG BIN_HOME=$MICRO_HOME/bin
+ARG SD_LOGS=/var/log/onap/AAI-SDB
+
+#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; \
+fi
# Build up the deployment folder structure
-RUN mkdir -p $MICRO_HOME $USERS_HOME /logs
+RUN mkdir -p $MICRO_HOME $USERS_HOME /logs $MICRO_HOME/bundleconfig/etc $BIN_HOME $SD_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
-COPY /maven/@project.artifactId@/ .
-RUN chmod 755 $BIN_HOME/* \
- && ln -snf /logs $MICRO_HOME/logs
+
+RUN chown -R aaiadmin:aaiadmin $MICRO_HOME $MICRO_HOME/logs $SD_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 --chown=aaiadmin:aaiadmin /maven/search-data-service-app/ .
+
+USER aaiadmin
+
+RUN chmod -R 755 $BIN_HOME/* $MICRO_HOME/*
+RUN ln -snf /logs $MICRO_HOME/logs
EXPOSE 9509 9509