Remove dockerproject org (#5548)
* 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:
parent
d640a57f9b
commit
38688a4486
5 changed files with 13 additions and 13 deletions
|
@ -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_base_url: "https://download.docker.com/linux/debian"
|
||||||
docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
|
docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
|
||||||
# dockerproject repo
|
# dockerproject repo
|
||||||
dockerproject_rh_repo_base_url: 'https://yum.dockerproject.org/repo/main/centos/7'
|
dockerproject_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable'
|
||||||
dockerproject_rh_repo_gpgkey: 'https://yum.dockerproject.org/gpg'
|
dockerproject_rh_repo_gpgkey: 'https://download.docker.com/linux/centos/gpg'
|
||||||
dockerproject_apt_repo_base_url: 'https://apt.dockerproject.org/repo'
|
dockerproject_apt_repo_base_url: 'https://download.docker.com/linux/debian'
|
||||||
dockerproject_apt_repo_gpgkey: 'https://apt.dockerproject.org/gpg'
|
dockerproject_apt_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
|
||||||
docker_bin_dir: "/usr/bin"
|
docker_bin_dir: "/usr/bin"
|
||||||
# CentOS/RedHat Extras repo
|
# CentOS/RedHat Extras repo
|
||||||
extras_rh_repo_base_url: "http://mirror.centos.org/centos/$releasever/extras/$basearch/"
|
extras_rh_repo_base_url: "http://mirror.centos.org/centos/$releasever/extras/$basearch/"
|
||||||
|
|
|
@ -27,9 +27,6 @@
|
||||||
tags:
|
tags:
|
||||||
- facts
|
- facts
|
||||||
|
|
||||||
# https://yum.dockerproject.org/repo/main/opensuse/ contains packages for an EOL
|
|
||||||
# openSUSE version so we can't use it. The only alternative is to use the docker
|
|
||||||
# packages from the distribution repositories.
|
|
||||||
- name: Warn about Docker version on SUSE
|
- name: Warn about Docker version on SUSE
|
||||||
debug:
|
debug:
|
||||||
msg: "SUSE distributions always install Docker from the distro repos"
|
msg: "SUSE distributions always install Docker from the distro repos"
|
||||||
|
@ -105,9 +102,14 @@
|
||||||
when: ansible_distribution == "Fedora" and not is_atomic
|
when: ansible_distribution == "Fedora" and not is_atomic
|
||||||
|
|
||||||
- name: Configure docker repository on RedHat/CentOS/Oracle Linux
|
- name: Configure docker repository on RedHat/CentOS/Oracle Linux
|
||||||
template:
|
yum_repository:
|
||||||
src: "rh_docker.repo.j2"
|
name: docker-ce
|
||||||
dest: "{{ yum_repo_dir }}/docker.repo"
|
baseurl: "{{ dockerproject_rh_repo_base_url }}"
|
||||||
|
description: "Docker CE Stable - $basearch"
|
||||||
|
gpgcheck: yes
|
||||||
|
gpgkey: "{{ dockerproject_rh_repo_gpgkey }}"
|
||||||
|
keepcache: "{{ docker_rpm_keepcache | default('1') }}"
|
||||||
|
proxy: " {{ http_proxy | default('_none_') }}"
|
||||||
when: ansible_distribution in ["CentOS","RedHat","OracleLinux"] and not is_atomic
|
when: ansible_distribution in ["CentOS","RedHat","OracleLinux"] and not is_atomic
|
||||||
|
|
||||||
- name: check if container-selinux is available
|
- name: check if container-selinux is available
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
docker_kernel_min_version: '3.10'
|
docker_kernel_min_version: '3.10'
|
||||||
|
|
||||||
# https://download.docker.com/linux/debian/
|
# https://download.docker.com/linux/debian/
|
||||||
# https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist
|
|
||||||
docker_versioned_pkg:
|
docker_versioned_pkg:
|
||||||
'latest': docker-ce
|
'latest': docker-ce
|
||||||
'1.13': docker-engine=1.13.1-0~debian-{{ ansible_distribution_release|lower }}
|
'1.13': docker-engine=1.13.1-0~debian-{{ ansible_distribution_release|lower }}
|
||||||
|
|
|
@ -3,7 +3,6 @@ docker_kernel_min_version: '0'
|
||||||
|
|
||||||
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
|
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
|
||||||
# https://download.docker.com/linux/centos/7/x86_64/stable/Packages/
|
# https://download.docker.com/linux/centos/7/x86_64/stable/Packages/
|
||||||
# https://yum.dockerproject.org/repo/main/centos/7
|
|
||||||
# or do 'yum --showduplicates list docker-engine'
|
# or do 'yum --showduplicates list docker-engine'
|
||||||
docker_versioned_pkg:
|
docker_versioned_pkg:
|
||||||
'latest': docker-ce
|
'latest': docker-ce
|
||||||
|
|
Loading…
Reference in a new issue