External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 09:38:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove dockerproject org (#5548)

Browse Source 
* Change dockerproject.org to download.docker.com

dockerproject.org was deprecated in 2017 and has gone down.

* Restore yum repo for containerd

Change-Id: I883bb512a2164a85865b1bd4fb569af0358c8c2b

Co-authored-by: Craig Rodrigues <rodrigc@crodrigues.org>
This commit is contained in:
Matthew Mosesohn
2020-01-17 11:38:55 +03:00
committed by Kubernetes Prow Robot
parent d640a57f9b
commit 38688a4486
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/container-engine/docker/defaults/main.yml
View File

@@ -39,10 +39,10 @@ docker_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
docker_debian_repo_base_url: "https://download.docker.com/linux/debian"
docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
# dockerproject repo
dockerproject_rh_repo_base_url: 'https://yum.dockerproject.org/repo/main/centos/7'
dockerproject_rh_repo_gpgkey: 'https://yum.dockerproject.org/gpg'
dockerproject_apt_repo_base_url: 'https://apt.dockerproject.org/repo'
dockerproject_apt_repo_gpgkey: 'https://apt.dockerproject.org/gpg'
dockerproject_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable'
dockerproject_rh_repo_gpgkey: 'https://download.docker.com/linux/centos/gpg'
dockerproject_apt_repo_base_url: 'https://download.docker.com/linux/debian'
dockerproject_apt_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
docker_bin_dir: "/usr/bin"
# CentOS/RedHat Extras repo
extras_rh_repo_base_url: "http://mirror.centos.org/centos/$releasever/extras/$basearch/"
@@ -67,4 +67,4 @@ docker_remove_packages_yum:
docker_remove_packages_apt:
- docker
- docker-engine
- docker.io
- docker.io