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

Merge pull request #27724 from wonderfly/fix_unbound_var

Browse Source 
Automatic merge from submit-queue

Make GCI_DOCKER_VERSION optional

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

fixes #26813

This env var is only set in `config-test.sh` and trying to evaluate it with
`nounset` set will end up with an "unbound variable" error.

@girishkalele @dchen1107 This is a XS fix. Can you review?
This commit is contained in:
k8s-merge-robot
2016-06-20 15:26:13 -07:00
committed by GitHub
parent 96e2224851 0acb2dc28a
commit 5c841556b8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/gci/helper.sh
View File

@@ -32,7 +32,7 @@ EOF
fi fi
if [[ ! -f "${KUBE_TEMP}/gci-docker-version.txt" ]]; then if [[ ! -f "${KUBE_TEMP}/gci-docker-version.txt" ]]; then
cat >"${KUBE_TEMP}/gci-docker-version.txt" << EOF cat >"${KUBE_TEMP}/gci-docker-version.txt" << EOF
${GCI_DOCKER_VERSION} ${GCI_DOCKER_VERSION:-}
EOF EOF
fi fi
} }