From 3d8e05bbf71147f4dec4b3ceec740e95bd91c7c4 Mon Sep 17 00:00:00 2001 From: ace Date: Fri, 21 Jul 2023 17:12:16 +0300 Subject: [PATCH] add Debian 12 support and bump to v24.0.4 --- defaults/main.yaml | 2 +- vars/Debian-11.yaml | 8 ++++---- vars/Debian-12.yaml | 29 +++++++++++++++++++++++++++++ vars/RedHat.yaml | 2 +- vars/Ubuntu-20.04.yaml | 6 +++--- vars/Ubuntu-22.04.yaml | 6 +++--- 6 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 vars/Debian-12.yaml diff --git a/defaults/main.yaml b/defaults/main.yaml index 9b460e7..95cdd4f 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,3 +1,3 @@ --- -docker_version: "20.10.24" +docker_version: "24.0.4" docker_install_official_repo: true diff --git a/vars/Debian-11.yaml b/vars/Debian-11.yaml index 8d9e915..459d684 100644 --- a/vars/Debian-11.yaml +++ b/vars/Debian-11.yaml @@ -7,14 +7,14 @@ docker_apt_repository: filename: docker docker_deps_packages: - - gnupg + - gnupg2 - python3-docker docker_package_name: "docker-ce" docker_epoch_version: "5" -docker_version_build: "~3-0~debian-bullseye" -docker_package: "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" -docker_packages: +docker_version_build: "1~{{ ansible_distribution | lower }}.{{ ansible_distribution_version }}~{{ ansible_distribution_release }}" +docker_package: "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}-{{ docker_version_build }}" +docker_packages: - "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" - "{{ docker_package_name }}-cli={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" - "{{ docker_package_name }}-rootless-extras={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" diff --git a/vars/Debian-12.yaml b/vars/Debian-12.yaml new file mode 100644 index 0000000..459d684 --- /dev/null +++ b/vars/Debian-12.yaml @@ -0,0 +1,29 @@ +docker_apt_key: + - name: "docker.gpg" + url: "https://download.docker.com/linux/debian/gpg" + keyring: "/etc/apt/trusted.gpg.d/docker.gpg" +docker_apt_repository: + - repo: "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/docker.gpg] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable" + filename: docker + +docker_deps_packages: + - gnupg2 + - python3-docker + +docker_package_name: "docker-ce" +docker_epoch_version: "5" +docker_version_build: "1~{{ ansible_distribution | lower }}.{{ ansible_distribution_version }}~{{ ansible_distribution_release }}" +docker_package: "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}-{{ docker_version_build }}" +docker_packages: + - "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" + - "{{ docker_package_name }}-cli={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" + - "{{ docker_package_name }}-rootless-extras={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" +docker_config_dir: "/etc/docker" +docker_home_dir: "/var/lib/docker" +docker_data_dir: "{{ docker_home_dir }}/{{ docker_major_version }}/{{ docker_cluster_name }}" +docker_ssl_path: "{{ docker_config_dir }}/{{ docker_major_version }}/{{ docker_cluster_name }}" +docker_package_name_regex: "{{ docker_package_name }}-{{ docker_version }}-{{ docker_version_build }}" +docker_cluster_name: "main" +docker_ssl_update_ca_command: "update-ca-certificates --fresh" +docker_ssl_ca_trust_dir: "/usr/local/share/ca-certificates" +docker_unit_name: "docker" diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml index 8a788c3..527044a 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -10,6 +10,6 @@ docker_rpm_repository: docker_package_name: "docker-ce" docker_package_epoch: "3" -docker_version_build: "3" +docker_version_build: "1" docker_package: "{{ docker_package_epoch }}:{{ docker_package_name }}-{{ docker_version }}-{{ docker_version_build }}.el{{ansible_facts['distribution_major_version']}}" docker_unit_name: "docker" diff --git a/vars/Ubuntu-20.04.yaml b/vars/Ubuntu-20.04.yaml index c1ff8a9..9dc5e82 100644 --- a/vars/Ubuntu-20.04.yaml +++ b/vars/Ubuntu-20.04.yaml @@ -7,13 +7,13 @@ docker_apt_repository: filename: docker docker_deps_packages: - - gnupg + - gnupg2 - python3-docker docker_package_name: "docker-ce" docker_epoch_version: "5" -docker_version_build: "~3-0~ubuntu-focal" -docker_package: "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" +docker_version_build: "1~{{ ansible_distribution | lower }}.{{ ansible_distribution_version }}~{{ ansible_distribution_release }}" +docker_package: "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}-{{ docker_version_build }}" docker_packages: - "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" - "{{ docker_package_name }}-cli={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" diff --git a/vars/Ubuntu-22.04.yaml b/vars/Ubuntu-22.04.yaml index 21ada18..9dc5e82 100644 --- a/vars/Ubuntu-22.04.yaml +++ b/vars/Ubuntu-22.04.yaml @@ -7,13 +7,13 @@ docker_apt_repository: filename: docker docker_deps_packages: - - gnupg + - gnupg2 - python3-docker docker_package_name: "docker-ce" docker_epoch_version: "5" -docker_version_build: "~3-0~ubuntu-jammy" -docker_package: "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" +docker_version_build: "1~{{ ansible_distribution | lower }}.{{ ansible_distribution_version }}~{{ ansible_distribution_release }}" +docker_package: "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}-{{ docker_version_build }}" docker_packages: - "{{ docker_package_name }}={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}" - "{{ docker_package_name }}-cli={{ docker_epoch_version }}:{{ docker_version }}{{ docker_version_build }}"