From a4a1e64a504003c927b2aba690460f9293ee412c Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Thu, 6 Apr 2017 21:06:36 +0000 Subject: Update the startup to default git server Change-Id: Ib71cb764fc0f28b9b8507164bd765edd791dc6bb Signed-off-by: Venkata Harish K Kajur --- ajsc-aai/src/main/resources/docker/startup.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ajsc-aai/src/main/resources/docker/startup.sh b/ajsc-aai/src/main/resources/docker/startup.sh index 2d8ea02..3d7c0fc 100644 --- a/ajsc-aai/src/main/resources/docker/startup.sh +++ b/ajsc-aai/src/main/resources/docker/startup.sh @@ -65,11 +65,17 @@ if [ ! -z "$ARG" ] && [ "$ARG" = "simple" ]; then else PROTOCOL=${PROTOCOL:-https}; - GITLAB_CERTNAME=${GITLAB_CERTNAME}; - GITLAB_USERNAME=${GITLAB_USERNAME}; - GITLAB_PASSWORD=${GITLAB_PASSWORD}; + GIT_SERVER_URL=${GIT_SERVER_URL:-gerrit.onap.org}; + GIT_USERNAME=${GIT_USERNAME}; + GIT_PASSWORD=${GIT_PASSWORD}; - docker_giturl=${PROTOCOL}://${GITLAB_USERNAME}:${GITLAB_PASSWORD}@${GITLAB_CERTNAME}/${AAI_REPO_PATH}; + docker_giturl=""; + + if [ ! -z "$GIT_USERNAME" ] && [ ! -z "$GIT_PASSWORD" ]; then + docker_giturl=${PROTOCOL}://${GIT_USERNAME}:${GIT_PASSWORD}@${GIT_SERVER_URL}/${AAI_REPO_PATH}; + else + docker_giturl=${PROTOCOL}://${GIT_SERVER_URL}/${AAI_REPO_PATH}; + fi cd /var/chef/ -- cgit 1.2.3-korg