From 0d38f219328bc128b2c9d0d58625a179ce6ddb14 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Sun, 3 May 2020 09:46:19 -0400
Subject: [PATCH] Use bionic repo for docker as focal is not yet available

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
---
 cluster/gce/gci/configure.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh
index b5d6f8dc1f1..10a7bdbfc19 100644
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -423,12 +423,19 @@ 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 \
     | apt-key add -
   add-apt-repository \
     "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
-    $(lsb_release -cs) stable"
+    $release stable"
 
   # Install Docker
   apt-get update && \
@@ -462,12 +469,19 @@ 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 \
     | apt-key add -
   add-apt-repository \
     "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
-    $(lsb_release -cs) stable"
+    $release stable"
 
   # Install containerd from Docker repo
   apt-get update && \