github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39472 from DjangoPeng/docker-fix

Browse Source 
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()`.
This commit is contained in:
Kubernetes Submit Queue 2017-01-05 22:22:07 -08:00 committed by GitHub
commit 3414ec3e13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/centos/build.sh
View File

@ -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