kube.sh: skip get-docker when Docker is installed from distro repo
On CentOS and Fedora, kube.sh installs Docker from distro repository. Running get-docker.sh to try installing Docker again when Docker package is not installed using that script can cause trouble as warned in that script itself [1]. [1] https://github.com/docker/docker-install/blob/91ca5b2/install.sh#L258-L262 Change-Id: Ib81dfeeb5b9e92d3449e66c7b0bdea86570d4990
This commit is contained in:
parent
a229b4f135
commit
399363b7cf
|
@ -71,6 +71,7 @@ function kube_wait_for_nodes {
|
|||
}
|
||||
|
||||
function kubeadm_aio_reqs_install {
|
||||
GET_DOCKER="True"
|
||||
if [ "x$HOST_OS" == "xubuntu" ]; then
|
||||
sudo apt-get install -y --no-install-recommends -qq \
|
||||
jq
|
||||
|
@ -80,6 +81,7 @@ function kubeadm_aio_reqs_install {
|
|||
sudo yum install -y \
|
||||
docker-latest \
|
||||
jq
|
||||
GET_DOCKER="False"
|
||||
sudo cp -f /usr/lib/systemd/system/docker-latest.service /etc/systemd/system/docker.service
|
||||
sudo sed -i "s|/var/lib/docker-latest|/var/lib/docker|g" /etc/systemd/system/docker.service
|
||||
sudo sed -i 's/^OPTIONS/#OPTIONS/g' /etc/sysconfig/docker-latest
|
||||
|
@ -90,6 +92,7 @@ function kubeadm_aio_reqs_install {
|
|||
sudo systemctl daemon-reload
|
||||
sudo systemctl restart docker
|
||||
elif [ "x$HOST_OS" == "xfedora" ]; then
|
||||
GET_DOCKER="False"
|
||||
sudo dnf install -y \
|
||||
docker-latest \
|
||||
jq
|
||||
|
@ -108,8 +111,10 @@ function kubeadm_aio_reqs_install {
|
|||
chmod +x ${TMP_DIR}/kubectl
|
||||
sudo mv ${TMP_DIR}/kubectl /usr/local/bin/kubectl
|
||||
|
||||
if [ "$GET_DOCKER" == "True" ]; then
|
||||
curl -fsSL get.docker.com -o ${TMP_DIR}/get-docker.sh
|
||||
sudo sh ${TMP_DIR}/get-docker.sh
|
||||
fi
|
||||
|
||||
rm -rf ${TMP_DIR}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue