Merge pull request #39472 from DjangoPeng/docker-fix

Automatic merge from submit-queue Fix unpack docker.tar.gz failure bug In centOS, there is a conflict bug of docker. We save docker as [docker.tar.gz](https://github.com/kubernetes/kubernetes/blob/master/cluster/centos/build.sh#L57) in function `download-releases()`, but uncompress [docker.tgz](https://github.com/kubernetes/kubernetes/blob/master/cluster/centos/build.sh#L98) in function `unpack-releases()`.

Merge pull request #39472 from DjangoPeng/docker-fix
3414ec3e · Kubernetes Submit Queue · GitHub · 7841d57b · 61076ede · 3414ec3e
Commit 3414ec3e authored Jan 05, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

build.sh cluster/centos/build.sh +2 -2

No files found.
--- a/cluster/centos/build.sh
+++ b/cluster/centos/build.sh
@@ -95,8 +95,8 @@ function unpack-releases() {
  fi

  # docker
-  if [[ -f ${RELEASES_DIR}/docker.tgz ]]; then
-    tar xzf ${RELEASES_DIR}/docker.tgz -C ${RELEASES_DIR}
+  if [[ -f ${RELEASES_DIR}/docker.tar.gz ]]; then
+    tar xzf ${RELEASES_DIR}/docker.tar.gz -C ${RELEASES_DIR}

    cp ${RELEASES_DIR}/docker/docker* ${BINARY_DIR}/node/bin
  fi