4 files changed, 47 insertions, 32 deletions
diff --git a/src/main/assembly/descriptor.xml b/src/main/assembly/descriptor.xml
new file mode 100644
index 0000000..2a1a2e7
--- /dev/null
+++ b/src/main/assembly/descriptor.xml
@@ -0,0 +1,36 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>build</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/bundleconfig-local</directory>
+            <outputDirectory>/bundleconfig</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/bin</directory>
+            <outputDirectory>/bin</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>Dockerfile</exclude>
+                <exclude>*.sh</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 76b5991..120f960 100644
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-BASEDIR="/opt/app/data-router/"
-AJSC_HOME="$BASEDIR"
+MICRO_HOME="/opt/app/data-router"
+
 
 
 if [ -z "$CONFIG_HOME" ]; then
@@ -14,8 +14,8 @@ if [ -z "$KEY_STORE_PASSWORD" ]; then
 	exit 1
 fi
 
-PROPS="-DAJSC_HOME=$AJSC_HOME"
-PROPS="$PROPS -Dlogging.config=$BASEDIR/bundleconfig/etc/logback.xml"
+PROPS="-DAJSC_HOME=${MICRO_HOME}"
+PROPS="$PROPS -Dlogging.config=${MICRO_HOME}/bundleconfig/etc/logback.xml"
 PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
 PROPS="$PROPS -DKEY_STORE_PASSWORD=$KEY_STORE_PASSWORD"
 
@@ -31,6 +31,6 @@ fi
 JVM_MAX_HEAP=${MAX_HEAP:-1024}
 
 cd ${MICRO_HOME}
-jar uf0 $MICRO_HOME/data-router.jar BOOT-INF/lib/*
+jar uf0 ${MICRO_HOME}/data-router.jar BOOT-INF/lib/* > /dev/null 2>&1
 
 exec java -Xmx${JVM_MAX_HEAP}m $PROPS -jar ${MICRO_HOME}/data-router.jar
 \ No newline at end of file
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 00827e3..7342a64 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,34 +1,13 @@
-FROM ubuntu:14.04
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
 ARG MICRO_HOME=/opt/app/data-router
 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
-## 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
-RUN export JAVA_HOME
-
-# Build up the deployment folder structure
 RUN mkdir -p $MICRO_HOME
-RUN mkdir -p $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
-COPY oxm $MICRO_HOME/
-
+WORKDIR $MICRO_HOME
+COPY /maven/data-router/ .
+RUN chmod 755 $BIN_HOME/* \
+    && ln -snf /logs $MICRO_HOME/logs
 
 EXPOSE 9502 9502
 
diff --git a/src/test/resources/config/schemaIngest.properties b/src/test/resources/config/schemaIngest.properties
index dc70df1..7b08122 100644
--- a/src/test/resources/config/schemaIngest.properties
+++ b/src/test/resources/config/schemaIngest.properties
@@ -1,7 +1,7 @@
 # Properties for the SchemaLocationsBean
 # Properties required by the aai-common - aai-schema-ingest lib as of 1.3.0
 schema.configuration.location=N/A
-schema.nodes.location=${APP_HOME}/target/oxm/${testShemaUnpackVersion}/oxm
+schema.nodes.location=${OXM_LOCATION}/${testShemaUnpackVersion}/oxm
 schema.edges.location=
 # These versions need to exist if they are included in the list
 schema.version.list=v10,v11,v12,v13,v14,v15