diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-04-15 13:54:27 +0200 |
|---|---|---|
| committer | Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-08-29 15:04:45 +0200 |
| commit | 3f8f4a735fe4051f4ed234083028d78994a29051 (patch) | |
| tree | 265c627fb3d0831853ee1e4b32242e1335e23148 /src | |
| parent | 57a671f6939ff82e58e8af02e979d857d01fbd63 (diff) | |
Fix project version parsing
Change-Id: I7a2c21325ecbddef806a031105b3e20eba53e405
Issue-ID: INT-760
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/main/docker/Dockerfile | 21 | ||||
| -rw-r--r-- | src/main/docker/aai.sh | 35 |
2 files changed, 25 insertions, 31 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 diff --git a/src/main/docker/aai.sh b/src/main/docker/aai.sh index f68dc21..4d8b6ce 100644 --- a/src/main/docker/aai.sh +++ b/src/main/docker/aai.sh @@ -20,25 +20,22 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -PROJECT_HOME=/opt/app/aai-graphadmin -export PROJECT_HOME - -JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 -export JAVA_HOME - -AAIENV=dev -export AAIENV - -PATH=/usr/lib/jvm/java-8-openjdk-amd64:$PATH - -PROJECT_OWNER=aaiadmin -PROJECT_GROUP=aaiadmin -PROJECT_UNIXHOMEROOT=/opt/aaihome -export PROJECT_OWNER PROJECT_GROUP PROJECT_UNIXHOMEROOT -umask 0022 - +# set system related env +# and make script compatible both with ubuntu and alpine base images +# jre-alpine image has $JAVA_HOME set and added to $PATH +# ubuntu image requires to set $JAVA_HOME and add java to $PATH manually +if [ -z $JAVA_HOME ] && [ $(grep -i "ID=ubuntu" /etc/os-release | wc -w) -eq 1 ] ; then + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-`dpkg --print-architecture | awk -F- '{ print $NF }'` + export PATH=$PATH:${JAVA_HOME}/jre/bin:${JAVA_HOME}/bin +fi + +# set app related env +export PROJECT_HOME=/opt/app/aai-graphadmin +export AAIENV=dev +export PROJECT_OWNER=aaiadmin +export PROJECT_GROUP=aaiadmin +export PROJECT_UNIXHOMEROOT=/opt/aaihome export idns_api_url= export idnscred= export idnstenant= - - +umask 0022 |