1 files changed, 11 insertions, 3 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 362814d..bd5d445 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:14.04
 
 ARG MICRO_HOME=/opt/app/babel
 ARG BIN_HOME=$MICRO_HOME/bin
+ARG JAR_FILE=babel.jar
 
 RUN apt-get update
 
@@ -10,15 +11,22 @@ 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-$(dpkg --print-architecture)
+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/babel/* $MICRO_HOME/
+COPY ${JAR_FILE} $MICRO_HOME
 RUN mkdir -p $BIN_HOME
 COPY *.sh $BIN_HOME
 RUN chmod 755 $BIN_HOME/*
 RUN ln -s /logs $MICRO_HOME/logs
 
-CMD ["/opt/app/babel/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
+USER aaiadmin
+
+CMD ["/opt/app/babel/bin/start.sh"]
+\ No newline at end of file