Skip to content

Commit 9714f3a

Browse files
committed
Restore docker focal version
1 parent 7030246 commit 9714f3a

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

cluster/gce/gci/configure.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -423,12 +423,7 @@ function install-docker {
423423
software-properties-common \
424424
lsb-release
425425

426-
# focal repo for docker is not yet available, so we use bonic for now
427-
# https://github.com/kubernetes/kubernetes/issues/90709
428426
release=$(lsb_release -cs)
429-
if [ "$release" == "focal" ]; then
430-
release="bionic";
431-
fi
432427

433428
# Add the Docker apt-repository
434429
curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg \
@@ -469,12 +464,7 @@ function install-containerd-ubuntu {
469464
software-properties-common \
470465
lsb-release
471466

472-
# focal repo for docker is not yet available, so we use bonic for now
473-
# https://github.com/kubernetes/kubernetes/issues/90709
474467
release=$(lsb_release -cs)
475-
if [ "$release" == "focal" ]; then
476-
release="bionic";
477-
fi
478468

479469
# Add the Docker apt-repository (as we install containerd from there)
480470
curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg \

0 commit comments

Comments
 (0)