aboutsummaryrefslogtreecommitdiffstats
path: root/aai-traversal/src/main/docker/Dockerfile
diff options
context:
space:
mode:
authorDmitry Puzikov <dmitry.puzikov@tieto.com>2019-04-12 12:49:05 +0200
committerDmitry Puzikov <dmitry.puzikov@tieto.com>2019-08-29 14:58:41 +0200
commite1505cc9bab7fd18a08c3797d873f3b2a261d10b (patch)
treed2c8c2f5043e16794f2d99b976f5d3f9ee852b72 /aai-traversal/src/main/docker/Dockerfile
parent88ba3797878f717a3a4d9b6e175a15634c019648 (diff)
Fixed project version parsing
Change-Id: I4d5179b66f9a7e210a8a9c51e80bd029a1f83983 Issue-ID: INT-762 Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Diffstat (limited to 'aai-traversal/src/main/docker/Dockerfile')
-rw-r--r--aai-traversal/src/main/docker/Dockerfile24
1 files changed, 9 insertions, 15 deletions
diff --git a/aai-traversal/src/main/docker/Dockerfile b/aai-traversal/src/main/docker/Dockerfile
index bbe0aa3..6ab1dd1 100644
--- a/aai-traversal/src/main/docker/Dockerfile
+++ b/aai-traversal/src/main/docker/Dockerfile
@@ -1,25 +1,19 @@
-FROM aaionap/aai-common:1.3.0
-
-
-# Add the proper files into the docker image from your build
-WORKDIR /opt/app/aai-traversal
-
-# Expose the ports for outside linux to use
-# 8446 is the important one to be used
-EXPOSE 8446
-
-
-HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8446 || exit 1
-
-ENTRYPOINT ["/bin/bash", "/opt/app/aai-traversal/docker-entrypoint.sh"]
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
RUN mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ
VOLUME /opt/aai/logroot/AAI-GQ
-
VOLUME /tmp
VOLUME /opt/tools
+HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8446 || exit 1
+
+# Add the proper files into the docker image from your build
+WORKDIR /opt/app/aai-traversal
COPY /maven/aai-traversal/ .
ENV AAI_BUILD_VERSION @aai.docker.version@
+# Expose the ports for outside linux to use
+# 8446 is the important one to be used
+EXPOSE 8446
+ENTRYPOINT ["/bin/bash", "/opt/app/aai-traversal/docker-entrypoint.sh"] \ No newline at end of file