zuul/zuul-jobs
Code Issues Proposed changes

Update ensure-docker for new releases

Browse Source 
Docker just released official packages for centos-8 so
we need to remove the temporary workaround that installs the
previous release version.

Change-Id: I787ce82b895069f4846fcdb35f55f0c9ad53652c
This commit is contained in:
Sorin Sbarnea 2020-09-18 07:52:05 +01:00
parent b91fb9e066
commit d31aa166f4
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/ensure-docker/tasks/docker-upstream.yaml
View File

@ -18,18 +18,6 @@
repositories_keys: "{{ _docker_keys }}" repositories_keys: "{{ _docker_keys }}"
repositories_list: "{{ _docker_repos }}" repositories_list: "{{ _docker_repos }}"
# Workaround for docker-ce installation failure due conflict with containerd.io
# https://bugzilla.redhat.com/show_bug.cgi?id=1756473#c1
- name: Patch docker-ce.repo for newer RedHat distros
when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8'
ini_file:
path: /etc/yum.repos.d/docker-ce.repo
section: docker-ce-stable
option: module_hotfixes
value: "True"
no_extra_spaces: true
create: false
- name: Install pre-reqs - name: Install pre-reqs
package: package:
name: "{{ _docker_upstream_distro_required_packages }}" name: "{{ _docker_upstream_distro_required_packages }}"

2
roles/ensure-docker/vars/redhat.yaml
View File

@ -38,7 +38,7 @@ _docker_repos:
- name: docker-ce-stable - name: docker-ce-stable
file: docker-ce file: docker-ce
description: Docker CE Stable - $basearch description: Docker CE Stable - $basearch
baseurl: "{{ docker_mirror_base_url }}/7/$basearch/stable" baseurl: "{{ docker_mirror_base_url }}/$releasever/$basearch/stable"
gpgcheck: yes gpgcheck: yes
_docker_distro_packages: _docker_distro_packages: