# 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
+
+# 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
EXPOSE 9502 9502
-CMD ["/opt/app/data-router/bin/start.sh"]
+CMD ["/opt/app/data-router/bin/start.sh"]
\ No newline at end of file