diff options
author | Jimmy Forsyth <jf2512@att.com> | 2019-09-05 09:27:50 -0400 |
---|---|---|
committer | Jimmy Forsyth <jf2512@att.com> | 2019-09-05 09:27:51 -0400 |
commit | 0b9b148455999c67e5af0ee60688a2d4b910153d (patch) | |
tree | b6be4dc4d934e434af1ad19ec8143ec4165713a4 /aai-resources/src/main/docker/aai.sh | |
parent | d41d978f319934fe8fd53054cea55544e772738a (diff) |
Configure docker settings
Issue-ID: INT-761
Change-Id: Ief98dfcb58bd204288d5b8a263365b573fc62163
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Diffstat (limited to 'aai-resources/src/main/docker/aai.sh')
-rw-r--r-- | aai-resources/src/main/docker/aai.sh | 35 |
1 files changed, 16 insertions, 19 deletions
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 |