seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix deploy_che.sh ability to be launched from any place (#9165) 

* fix deploy_che.sh ability to be launched from any place
6.19.x
Roman Iuvshyn 2018-03-21 14:31:51 +02:00 committed by GitHub
parent b17c44e2ac
commit bd3c1956a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deploy/openshift/deploy_che.sh
View File

@ -93,7 +93,7 @@ wait_until_che_is_available() {
}
# --------------
# Print Che logo
# Print Che logo
# --------------
echo
@ -146,6 +146,7 @@ DEFAULT_OPENSHIFT_FLAVOR="minishift"
OPENSHIFT_FLAVOR=${OPENSHIFT_FLAVOR:-${DEFAULT_OPENSHIFT_FLAVOR}}
DEFAULT_DNS_PROVIDER="nip.io"
DNS_PROVIDER=${DNS_PROVIDER:-${DEFAULT_DNS_PROVIDER}}
BASE_DIR=$(cd "$(dirname "$0")"; pwd)
# If OpenShift flavor is MiniShift check its availability
if [ "${OPENSHIFT_FLAVOR}" == "minishift" ]; then
@ -284,9 +285,9 @@ CHE_KEYCLOAK_OSO_ENDPOINT=${CHE_KEYCLOAK_OSO_ENDPOINT:-${DEFAULT_CHE_KEYCLOAK_OS
KEYCLOAK_GITHUB_ENDPOINT=${KEYCLOAK_GITHUB_ENDPOINT:-${DEFAULT_KEYCLOAK_GITHUB_ENDPOINT}}
get_che_pod_config() {
DEFAULT_CHE_DEPLOYMENT_FILE_PATH=./che-openshift.yml
DEFAULT_CHE_DEPLOYMENT_FILE_PATH=${BASE_DIR}/che-openshift.yml
CHE_DEPLOYMENT_FILE_PATH=${CHE_DEPLOYMENT_FILE_PATH:-${DEFAULT_CHE_DEPLOYMENT_FILE_PATH}}
DEFAULT_CHE_CONFIG_FILE_PATH=./che-config
DEFAULT_CHE_CONFIG_FILE_PATH=${BASE_DIR}/che-config
CHE_CONFIG_FILE_PATH=${CHE_CONFIG_FILE_PATH:-${DEFAULT_CHE_CONFIG_FILE_PATH}}
cat "${CHE_DEPLOYMENT_FILE_PATH}" | \
sed "s/ image:.*/ image: \"${CHE_IMAGE_SANITIZED}\"/" | \
@ -358,7 +359,7 @@ if ! oc get project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null; then
echo "Project \"${CHE_OPENSHIFT_PROJECT}\" does not exist...trying to create it."
DEPLOYMENT_TIMEOUT_SEC=120
POLLING_INTERVAL_SEC=2
timeout_in=$((POLLING_INTERVAL_SEC+DEPLOYMENT_TIMEOUT_SEC))
timeout_in=$((POLLING_INTERVAL_SEC+DEPLOYMENT_TIMEOUT_SEC))
while $WAIT_FOR_PROJECT_TO_DELETE
do
{ # try
@ -366,7 +367,7 @@ if ! oc get project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null; then
if [ "$timeout_in" -le "0" ] ; then
echo "[CHE] **ERROR**: Timeout of $DEPLOYMENT_TIMEOUT_SEC waiting for project \"${CHE_OPENSHIFT_PROJECT}\" to be deleted."
exit 1
fi
fi
oc new-project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null && \
WAIT_FOR_PROJECT_TO_DELETE=false # Only excutes if project creation is successfully
} || { # catch
@ -429,13 +430,11 @@ oc apply -f -
# for postgres and optionally Keycloak
# -------------------------------------------------------------
COMMAND_DIR=$(dirname "$0")
if [[ "${CHE_MULTIUSER}" == "true" ]] && [[ "${COMMAND}" == "deploy" ]]; then
if [ "${CHE_DEDICATED_KEYCLOAK}" == "true" ]; then
"${COMMAND_DIR}"/multi-user/deploy_postgres_and_keycloak.sh
"${BASE_DIR}"/multi-user/deploy_postgres_and_keycloak.sh
else
"${COMMAND_DIR}"/multi-user/deploy_postgres_only.sh
"${BASE_DIR}"/multi-user/deploy_postgres_only.sh
fi
fi
@ -539,7 +538,7 @@ if [ "${WAIT_FOR_CHE}" == "true" ]; then
fi
if [ "${CHE_DEDICATED_KEYCLOAK}" == "true" ]; then
"${COMMAND_DIR}"/multi-user/configure_keycloak.sh
"${BASE_DIR}"/multi-user/configure_keycloak.sh
fi
che_route=$(oc get route che -o jsonpath='{.spec.host}')