github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74970 from ipuustin/lib-util-sh-2

Browse Source 
hack/lib/util.sh: fix empty array expansion with bash 3.
This commit is contained in:
Kubernetes Prow Robot
2019-03-06 02:08:33 -08:00
committed by GitHub
parent 62065bd27d ecb6d13253
commit a7346b60bc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/lib/util.sh
View File

@@ -649,7 +649,9 @@ EOF
# Determines if docker can be run, failures may simply require that the user be added to the docker group. # Determines if docker can be run, failures may simply require that the user be added to the docker group.
function kube::util::ensure_docker_daemon_connectivity { function kube::util::ensure_docker_daemon_connectivity {
IFS=" " read -ra DOCKER <<< "${DOCKER_OPTS}" IFS=" " read -ra DOCKER <<< "${DOCKER_OPTS}"
DOCKER=(docker "${DOCKER[@]}") # Expand ${DOCKER[@]} only if it's not unset. This is to work around
# Bash 3 issue with unbound variable.
DOCKER=(docker ${DOCKER[@]:+"${DOCKER[@]}"})
if ! "${DOCKER[@]}" info > /dev/null 2>&1 ; then if ! "${DOCKER[@]}" info > /dev/null 2>&1 ; then
cat <<'EOF' >&2 cat <<'EOF' >&2
Can't connect to 'docker' daemon. please fix and retry. Can't connect to 'docker' daemon. please fix and retry.