diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-04-12 16:48:42 +0200 |
|---|---|---|
| committer | Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-08-29 15:09:44 +0200 |
| commit | 62901567f5cf9c57ffdd51d77fcbd797adc39f93 (patch) | |
| tree | 31eb933862d0436846b5cfc76aff4c5549f570d0 /aai-resources/src | |
| parent | e8d95f2d2d0f82f84b8235e73a95f45e2b34c90d (diff) | |
Fixed project version parsing
Change-Id: Ie32719f771e86f7dac5aa2ce3124f7c507183bdc
Issue-ID: INT-761
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Diffstat (limited to 'aai-resources/src')
| -rw-r--r-- | aai-resources/src/main/docker/Dockerfile | 23 | ||||
| -rw-r--r-- | aai-resources/src/main/docker/aai.sh | 35 |
2 files changed, 25 insertions, 33 deletions
diff --git a/aai-resources/src/main/docker/Dockerfile b/aai-resources/src/main/docker/Dockerfile index e6d9d6f..1c17a75 100644 --- a/aai-resources/src/main/docker/Dockerfile +++ b/aai-resources/src/main/docker/Dockerfile @@ -1,17 +1,4 @@ -FROM aaionap/aai-common:1.3.0 - - -# Add the proper files into the docker image from your build -WORKDIR /opt/app/aai-resources - -# Expose the ports for outside linux to use -# 8447 is the important one to be used -EXPOSE 8447 - - -HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost ${SERVER_PORT:-8447} || exit 1 - -ENTRYPOINT ["/bin/bash", "/opt/app/aai-resources/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-RES @@ -19,6 +6,14 @@ VOLUME /opt/aai/logroot/AAI-RES VOLUME /tmp VOLUME /opt/tools +HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost ${SERVER_PORT:-8447} || exit 1 + +# Add the proper files into the docker image from your build +WORKDIR /opt/app/aai-resources COPY /maven/aai-resources/ . ENV AAI_BUILD_VERSION @aai.docker.version@ +# Expose the ports for outside linux to use +# 8447 is the important one to be used +EXPOSE 8447 +ENTRYPOINT ["/bin/bash", "/opt/app/aai-resources/docker-entrypoint.sh"]
\ No newline at end of file diff --git a/aai-resources/src/main/docker/aai.sh b/aai-resources/src/main/docker/aai.sh index 2e2c35f..11b9c85 100644 --- a/aai-resources/src/main/docker/aai.sh +++ b/aai-resources/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-resources -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-resources +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 |