Merge pull request #258 from ElvinEfendi/fix-fixed-scripts

Fix "DIND_K8S_BIN_DIR: unbound variable" error when running fixed scripts
kubernetes-retired · Nov 26, 2018 · 6cc498d · 6cc498d
2 parents bd00df5 + 91b890a
commit 6cc498d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/dind-cluster.sh b/dind-cluster.sh
@@ -1037,7 +1037,7 @@ function dind::run {
 
   dind::step "Starting DIND container:" "${container_name}"
 
-  if [[ ${DIND_K8S_BIN_DIR} ]]; then
+  if [[ ! -z ${DIND_K8S_BIN_DIR:-} ]]; then
       opts+=(-v ${DIND_K8S_BIN_DIR}:/k8s)
   fi
   if [[ ! ${using_linuxkit} ]]; then

diff --git a/fixed/dind-cluster-stable.sh b/fixed/dind-cluster-stable.sh
@@ -1037,7 +1037,7 @@ function dind::run {
 
   dind::step "Starting DIND container:" "${container_name}"
 
-  if [[ ${DIND_K8S_BIN_DIR} ]]; then
+  if [[ ! -z ${DIND_K8S_BIN_DIR:-} ]]; then
       opts+=(-v ${DIND_K8S_BIN_DIR}:/k8s)
   fi
   if [[ ! ${using_linuxkit} ]]; then

diff --git a/fixed/dind-cluster-v1.10.sh b/fixed/dind-cluster-v1.10.sh
@@ -1037,7 +1037,7 @@ function dind::run {
 
   dind::step "Starting DIND container:" "${container_name}"
 
-  if [[ ${DIND_K8S_BIN_DIR} ]]; then
+  if [[ ! -z ${DIND_K8S_BIN_DIR:-} ]]; then
       opts+=(-v ${DIND_K8S_BIN_DIR}:/k8s)
   fi
   if [[ ! ${using_linuxkit} ]]; then

diff --git a/fixed/dind-cluster-v1.11.sh b/fixed/dind-cluster-v1.11.sh
@@ -1037,7 +1037,7 @@ function dind::run {
 
   dind::step "Starting DIND container:" "${container_name}"
 
-  if [[ ${DIND_K8S_BIN_DIR} ]]; then
+  if [[ ! -z ${DIND_K8S_BIN_DIR:-} ]]; then
       opts+=(-v ${DIND_K8S_BIN_DIR}:/k8s)
   fi
   if [[ ! ${using_linuxkit} ]]; then

diff --git a/fixed/dind-cluster-v1.12.sh b/fixed/dind-cluster-v1.12.sh
@@ -1037,7 +1037,7 @@ function dind::run {
 
   dind::step "Starting DIND container:" "${container_name}"
 
-  if [[ ${DIND_K8S_BIN_DIR} ]]; then
+  if [[ ! -z ${DIND_K8S_BIN_DIR:-} ]]; then
       opts+=(-v ${DIND_K8S_BIN_DIR}:/k8s)
   fi
   if [[ ! ${using_linuxkit} ]]; then

diff --git a/fixed/dind-cluster-v1.9.sh b/fixed/dind-cluster-v1.9.sh
@@ -1037,7 +1037,7 @@ function dind::run {
 
   dind::step "Starting DIND container:" "${container_name}"
 
-  if [[ ${DIND_K8S_BIN_DIR} ]]; then
+  if [[ ! -z ${DIND_K8S_BIN_DIR:-} ]]; then
       opts+=(-v ${DIND_K8S_BIN_DIR}:/k8s)
   fi
   if [[ ! ${using_linuxkit} ]]; then