diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-04-15 13:54:27 +0200 |
|---|---|---|
| committer |   James Forsyth <jf2512@att.com> | 2019-09-05 13:28:54 +0000 |
| commit | 7d078e1683d55b5caef943591de43283414782f2 (patch) | |
| tree | 15c7d5d821293914be30f51bfb560836f9efbdd3 /src/main/docker/Dockerfile | |
| parent | 6eaac9f415242d97379f7c3b72ed9c2496e51e50 (diff) | |
Fix project version parsing
Change-Id: I7a2c21325ecbddef806a031105b3e20eba53e405
Issue-ID: INT-760
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
(cherry picked from commit 3f8f4a735fe4051f4ed234083028d78994a29051)
Diffstat (limited to 'src/main/docker/Dockerfile')
| -rwxr-xr-x | src/main/docker/Dockerfile | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index f1454e3..9129f09 100755 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,15 +1,4 @@ -FROM aaionap/aai-common:1.3.0 - -# Add the proper files into the docker image from your build -WORKDIR /opt/app/aai-graphadmin - -# Expose the ports for outside linux to use -# 8447 is the important one to be used -EXPOSE 8449 - -HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8449 || exit 1 - -ENTRYPOINT ["/bin/bash", "/opt/app/aai-graphadmin/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-GA @@ -17,6 +6,14 @@ VOLUME /opt/aai/logroot/AAI-GA VOLUME /opt/data VOLUME /opt/tools +HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8449 || exit 1 + +# Add the proper files into the docker image from your build +WORKDIR /opt/app/aai-graphadmin COPY /maven/aai-graphadmin/ . ENV AAI_BUILD_VERSION @aai.docker.version@ +# Expose the ports for outside linux to use +# 8449 is the important one to be used +EXPOSE 8449 +ENTRYPOINT ["/bin/bash", "/opt/app/aai-graphadmin/docker-entrypoint.sh"]
\ No newline at end of file |