github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92344 from jherrera123/restore-docker-focal-version

Browse Source 
Restore docker focal version in gci nodes
This commit is contained in:
Kubernetes Prow Robot
2020-06-21 15:28:39 -07:00
committed by GitHub
parent 656a01fb04 9714f3ac86
commit d140769e4d
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/gce/gci/configure.sh
View File

@@ -432,12 +432,7 @@ function install-docker {
software-properties-common \
lsb-release
# focal repo for docker is not yet available, so we use bonic for now
# https://github.com/kubernetes/kubernetes/issues/90709
release=$(lsb_release -cs)
if [ "$release" == "focal" ]; then
release="bionic";
fi
# Add the Docker apt-repository
curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg \
@@ -478,12 +473,7 @@ function install-containerd-ubuntu {
software-properties-common \
lsb-release
# focal repo for docker is not yet available, so we use bonic for now
# https://github.com/kubernetes/kubernetes/issues/90709
release=$(lsb_release -cs)
if [ "$release" == "focal" ]; then
release="bionic";
fi
# Add the Docker apt-repository (as we install containerd from there)
curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg \