X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=8578ef62ff5f79d5553cd98618ce7282b93ad505;hb=9fcd2fde2324077ba019cbf845caec4378599613;hp=3198bb16b000a0373e3d9c15aa0f7a37caddf9e6;hpb=895cd72a962de1868151288d4df1510db5280fab;p=aai%2Fsearch-data-service.git

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 3198bb1..8578ef6 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -3,21 +3,22 @@ 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
+## 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
+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
-ADD swm/package/nix/dist_files/appl/search-data-service/* $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