Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OpenShift Origin version to 3.9 #9509

Merged
3 commits merged into from
Apr 23, 2018
Merged

Update OpenShift Origin version to 3.9 #9509

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
529df95
Update OpenShift Origin version to 3.9
Apr 20, 2018
b54cd09
Update grep to verify docker registyr container is in running state
Apr 22, 2018
4e620e9
Do not list exited containers when looking for Registry container ID
Apr 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deploy/openshift/ocp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ BASE_DIR=$(cd "$(dirname "$0")"; pwd)
if [[ "$OSTYPE" == "darwin"* ]]; then
DEFAULT_OC_PUBLIC_HOSTNAME="$LOCAL_IP_ADDRESS"
DEFAULT_OC_PUBLIC_IP="$LOCAL_IP_ADDRESS"
DEFAULT_OC_BINARY_DOWNLOAD_URL="https://github.com/openshift/origin/releases/download/v3.7.0/openshift-origin-client-tools-v3.7.0-7ed6862-mac.zip"
DEFAULT_OC_BINARY_DOWNLOAD_URL="https://github.com/openshift/origin/releases/download/v3.9.0/openshift-origin-client-tools-v3.9.0-191fece-mac.zip"
DEFAULT_JQ_BINARY_DOWNLOAD_URL="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-osx-amd64"
else
DEFAULT_OC_PUBLIC_HOSTNAME="$LOCAL_IP_ADDRESS"
DEFAULT_OC_PUBLIC_IP="$LOCAL_IP_ADDRESS"
DEFAULT_OC_BINARY_DOWNLOAD_URL="https://github.com/openshift/origin/releases/download/v3.7.0/openshift-origin-client-tools-v3.7.0-7ed6862-linux-64bit.tar.gz"
DEFAULT_OC_BINARY_DOWNLOAD_URL="https://github.com/openshift/origin/releases/download/v3.9.0/openshift-origin-client-tools-v3.9.0-191fece-linux-64bit.tar.gz"
DEFAULT_JQ_BINARY_DOWNLOAD_URL="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64"
fi

Expand Down Expand Up @@ -134,7 +134,7 @@ get_tools() {

ocp_is_booted() {
# we have to wait before docker registry will be started as it is staring as last container and it should be running before we perform che deploy.
ocp_registry_container_id=$(docker ps -a | grep openshift/origin-docker-registry | cut -d ' ' -f1)
ocp_registry_container_id=$(docker ps | grep k8s_registry_docker-registry | cut -d ' ' -f1)
if [ ! -z "$ocp_registry_container_id" ];then
ocp_registry_container_status=$(docker inspect "$ocp_registry_container_id" | $JQ_BINARY .[0] | $JQ_BINARY -r '.State.Status')
else
Expand Down