From 9714f3ac862a3f9cb78396564ce76379e128f909 Mon Sep 17 00:00:00 2001 From: Jesus Herrera Date: Sat, 20 Jun 2020 11:16:25 -0400 Subject: [PATCH] Restore docker focal version --- cluster/gce/gci/configure.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index d2e6500c5ca..c0ced746e47 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -423,12 +423,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 \ @@ -469,12 +464,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 \