add Debian 12 support and bump to v24.0.4

This commit is contained in:
ace 2023-07-21 17:12:16 +03:00
parent 015f291414
commit 3d8e05bbf7
Signed by: ace
GPG Key ID: 2C08973DD37A76FD
6 changed files with 41 additions and 12 deletions

View File

@ -1,3 +1,3 @@
---
docker_version: "20.10.24"
docker_version: "24.0.4"
docker_install_official_repo: true

View File

@ -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 }}"

29
vars/Debian-12.yaml Normal file
View File

@ -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"

View File

@ -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"

View File

@ -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 }}"

View File

@ -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 }}"