Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use bionic repo for docker as focal is not yet available #90702

Merged
merged 1 commit into from May 4, 2020
Merged

Use bionic repo for docker as focal is not yet available #90702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 16 additions & 2 deletions cluster/gce/gci/configure.sh
View file
Open in desktop
Expand Up @@ -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 && \
Expand Down Expand Up @@ -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 && \
Expand Down