-# FROM ubuntu:14.04
-FROM onap/search-service:0.0.1
+FROM ubuntu:14.04
ARG MICRO_HOME=/opt/app/search-data-service
ARG BIN_HOME=$MICRO_HOME/bin
-# RUN apt-get update
-
## Install and setup java8
-# RUN apt-get update && apt-get install -y software-properties-common
+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
+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
+ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+RUN export JAVA_HOME
# Build up the deployment folder structure
RUN mkdir -p $MICRO_HOME
+RUN mkdir -p $MICRO_HOME/bundleconfig/etc
ADD search-data-service* $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
-EXPOSE 9509 9509
-
-# CMD ["/opt/app/search-data-service/bin/start.sh"]
+# 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
+RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+RUN sudo usermod -a -G sudo aaiadmin
+USER aaiadmin
+EXPOSE 9509 9509
-# COPY search-data-service-1.2.0-SNAPSHOT.jar /
-## Tomcat keystore will be mapped in via mounted volumes.
-##COPY tomcat_keystore /
-####COPY onap-cert.crt /
-####COPY client-cert-onap.p12 /
-#COPY start.sh /
-## RUN chmod +x start.sh
-
-EXPOSE 5443 5443
-EXPOSE 8000 8000
+CMD ["/opt/app/search-data-service/bin/start.sh"]