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

Pin containerd for centos and ubuntu #125

Merged
merged 2 commits into from
Jul 30, 2021
Merged

Pin containerd for centos and ubuntu #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a138f0
Pin containerd for centos and ubuntu
obierlaire Jul 15, 2021
5bb1f2d
add iptables for centos8
obierlaire Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tasks/base/CentOS-8/install_dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
with_items:
- lvm2
- mdadm
- iptables
9 changes: 1 addition & 8 deletions tasks/base/CentOS-8/install_docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,14 @@
name: "{{ docker_version_map[docker_version]['name'] }}"
description: "Docker repository"
file: docker-ce
baseurl: https://download.docker.com/linux/centos/7/x86_64/stable
baseurl: "{{ docker_version_map[docker_version]['repo'] }}"
enabled: yes
gpgcheck: no
when: docker_version == '19.03'
register: repo_installed
retries: 10
delay: 30
until: repo_installed is success

- name: Install containerd separately (CentOS 8).
package:
name: https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.13-3.2.el7.x86_64.rpm
state: present
when: ansible_distribution_major_version | int == 8

- name: Install docker
package:
name: "{{ docker_version_map[docker_version]['package'] }}"
Expand Down
6 changes: 3 additions & 3 deletions vars/os_CentOS_7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ docker_version_map:
"18.09":
name: 'Docker-CE'
package:
- docker-ce-18.09.2
- docker-ce-cli-18.09.2
- containerd.io
- docker-ce-18.09.9
- docker-ce-cli-18.09.9
- containerd.io-1.4.3
repo: https://download.docker.com/linux/centos/7/x86_64/stable
keys:
server: https://download.docker.com/linux/centos/gpg
8 changes: 4 additions & 4 deletions vars/os_CentOS_8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ docker_version_map:
"19.03":
name: 'Docker-CE'
package:
- docker-ce-19.03.13
- docker-ce-cli-19.03.13
- containerd.io
repo: https://download.docker.com/linux/centos/docker-ce.repo
- docker-ce-19.03.15
- docker-ce-cli-19.03.15
- containerd.io-1.4.3
repo: https://download.docker.com/linux/centos/8/x86_64/stable
keys:
server: https://download.docker.com/linux/centos/gpg
id: 060A 61C5 1B55 8A7F 742B 77AA C52F EB6B 621E 9F35
6 changes: 3 additions & 3 deletions vars/os_Ubuntu_16.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ bootloader_update_command: update-grub
docker_version_map:
"18.09":
package:
- docker-ce=5:18.09.2*
- docker-ce-cli=5:18.09.2*
- containerd.io
- docker-ce=5:18.09.9*
- docker-ce-cli=5:18.09.9*
- containerd.io=1.4.3-1*
repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable
keys:
server: https://download.docker.com/linux/ubuntu/gpg
Expand Down
6 changes: 3 additions & 3 deletions vars/os_Ubuntu_18.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ bootloader_update_command: update-grub
docker_version_map:
"19.03":
package:
- docker-ce=5:19.03.13*
- docker-ce-cli=5:19.03.13*
- containerd.io
- docker-ce=5:19.03.15*
- docker-ce-cli=5:19.03.15*
- containerd.io=1.4.3-1*
repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable
keys:
server: https://download.docker.com/linux/ubuntu/gpg
Expand Down