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

Update docker packages to 19.03.13 + add docker f32 #6712

Merged
merged 1 commit into from
Sep 23, 2020
Merged

Update docker packages to 19.03.13 + add docker f32 #6712

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions roles/container-engine/docker/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ yum_repo_dir: /etc/yum.repos.d
docker_yum_conf: /etc/yum_docker.conf

# Fedora docker-ce repo
# TODO Remove the line below as soon as docker rpm are available for f32
docker_fedora_release: "{{ '31' if (ansible_distribution_major_version | int) > 31 else ansible_distribution_major_version }}"
docker_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/{{ docker_fedora_release }}/$basearch/stable'
docker_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/{{ ansible_distribution_major_version }}/$basearch/stable'
docker_fedora_repo_gpgkey: 'https://download.docker.com/linux/fedora/gpg'
# CentOS/RedHat docker-ce repo
docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable'
Expand Down
8 changes: 4 additions & 4 deletions roles/container-engine/docker/vars/debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ docker_versioned_pkg:
'18.03': docker-ce=18.03.1~ce-0~debian
'18.06': docker-ce=18.06.2~ce~3-0~debian
'18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.12~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.12~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.12~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}

docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.12~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}

docker_package_info:
pkg_mgr: apt
Expand Down
19 changes: 8 additions & 11 deletions roles/container-engine/docker/vars/fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
---
docker_kernel_min_version: '0'

# TODO Remove the line below as soon as docker rpm are available for f32
fedora_distribution_package: "{{ '31' if (ansible_distribution_major_version | int) > 31 else ansible_distribution_major_version }}"

# https://docs.docker.com/install/linux/docker-ce/fedora/
# https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/
docker_versioned_pkg:
'latest': docker-ce
'18.03': docker-ce-18.03.1.ce-3.fc{{ fedora_distribution_package }}
'18.06': docker-ce-18.06.2.ce-3.fc{{ fedora_distribution_package }}
'18.09': docker-ce-18.09.7-3.fc{{ fedora_distribution_package }}
'19.03': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
'stable': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
'edge': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
'18.03': docker-ce-18.03.1.ce-3.fc{{ ansible_distribution_major_version }}
'18.06': docker-ce-18.06.2.ce-3.fc{{ ansible_distribution_major_version }}
'18.09': docker-ce-18.09.7-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}

docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-19.03.12-3.fc{{ fedora_distribution_package }}
'19.03': docker-ce-cli-19.03.12-3.fc{{ fedora_distribution_package }}
'18.09': docker-ce-cli-19.03.13-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-cli-19.03.13-3.fc{{ ansible_distribution_major_version }}

docker_package_info:
pkg_mgr: dnf
Expand Down
10 changes: 5 additions & 5 deletions roles/container-engine/docker/vars/redhat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
docker_kernel_min_version: '0'

# 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/<centos_version>>/x86_64/stable/Packages/
# or do 'yum --showduplicates list docker-engine'
docker_versioned_pkg:
'latest': docker-ce
Expand All @@ -12,14 +12,14 @@ docker_versioned_pkg:
'18.03': docker-ce-18.03.1.ce-1.el7.centos
'18.06': docker-ce-18.06.3.ce-3.el7
'18.09': docker-ce-18.09.9-3.el7
'19.03': docker-ce-19.03.12-3.el7
'stable': docker-ce-19.03.12-3.el7
'edge': docker-ce-19.03.12-3.el7
'19.03': docker-ce-19.03.13-3.el7
'stable': docker-ce-19.03.13-3.el7
'edge': docker-ce-19.03.13-3.el7

docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-18.09.9-3.el7
'19.03': docker-ce-cli-19.03.12-3.el7
'19.03': docker-ce-cli-19.03.13-3.el7

docker_selinux_versioned_pkg:
'latest': docker-ce-selinux-17.03.3.ce-1.el7
Expand Down
8 changes: 4 additions & 4 deletions roles/container-engine/docker/vars/ubuntu-amd64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ docker_versioned_pkg:
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}

docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}

docker_package_info:
pkg_mgr: apt
Expand Down
8 changes: 4 additions & 4 deletions roles/container-engine/docker/vars/ubuntu-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ docker_versioned_pkg:
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}

docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}

docker_package_info:
pkg_mgr: apt
Expand Down