github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90702 from dims/use-bionic-repo-for-docker

Browse Source 
Use bionic repo for docker as focal is not yet available
This commit is contained in:
Kubernetes Prow Robot 2020-05-03 17:36:26 -07:00 committed by GitHub
commit 4ccfeb18d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 && \