Fixed project version parsing

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

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 8963fa8..7342a64 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,40 +1,14 @@
-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
-
-# 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
+WORKDIR $MICRO_HOME
+COPY /maven/data-router/ .
+RUN chmod 755 $BIN_HOME/* \
+    && ln -snf /logs $MICRO_HOME/logs
 
 EXPOSE 9502 9502
 
-CMD ["/opt/app/data-router/bin/start.sh"]
\ No newline at end of file
+CMD ["/opt/app/data-router/bin/start.sh"]