Fixing the docker jenkins job

[aai/data-router.git] / src / main / docker / Dockerfile

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index f53850d..9ef6cb5 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -10,17 +10,25 @@ 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--amd64
 RUN export JAVA_HOME
 
 # Build up the deployment folder structure
 RUN mkdir -p $MICRO_HOME
-ADD swm/package/nix/dist_files/appl/data-router/* $MICRO_HOME/
 RUN mkdir -p $BIN_HOME
-COPY *.sh $BIN_HOME
+RUN mkdir -p $MICRO_HOME/bundleconfig
+RUN mkdir -p $MICRO_HOME/bundleconfig/etc
+RUN mkdir -p $MICRO_HOME/BOOT-INF/lib
+COPY start.sh $MICRO_HOME/bin/
 RUN chmod 755 $BIN_HOME/*
 RUN ln -s /logs $MICRO_HOME/logs
+ENV MICRO_HOME ${MICRO_HOME}
+ENV CONFIG_HOME=${CONFIG_HOME}
+COPY data-router.jar $MICRO_HOME/
+COPY bundleconfig-local $MICRO_HOME/bundleconfig
+COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc
+
 
 EXPOSE 9502 9502
 
-CMD /opt/app/data-router/bin/start.sh
+CMD ["/opt/app/data-router/bin/start.sh"]