From d64f9afe1981a03a944c3551e8e8b3de73289688 Mon Sep 17 00:00:00 2001 From: Aram Akhavan Date: Mon, 8 Aug 2022 17:11:52 -0700 Subject: [PATCH 1/2] add filename option to apt repository add --- README.md | 1 + defaults/main.yml | 1 + tasks/setup-Debian.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/README.md b/README.md index 953b7dd..f4be6a0 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ The main Docker repo URL, common between Debian and RHEL systems. docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: True docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" + docker_apt_filename: "" (Used only for Debian/Ubuntu.) You can switch the channel to `nightly` if you want to use the Nightly release. diff --git a/defaults/main.yml b/defaults/main.yml index 870a94c..e9afb09 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -36,6 +36,7 @@ docker_repo_url: https://download.docker.com/linux docker_apt_release_channel: stable docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}" docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_apt_filename: "" docker_apt_ignore_key_error: true docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 0abcd17..c6fe8c4 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -49,5 +49,6 @@ apt_repository: repo: "{{ docker_apt_repository }}" state: present + filename: "{{ docker_apt_filename }}" update_cache: true when: docker_add_repo | bool From c3a127134d6bde44bdd57fa1be1751f77d887614 Mon Sep 17 00:00:00 2001 From: Aram Akhavan Date: Mon, 8 Aug 2022 17:15:28 -0700 Subject: [PATCH 2/2] change default compose install to plugin, apt repository filename to docker.list --- defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e9afb09..fb44017 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,12 +15,12 @@ docker_service_enabled: true docker_restart_handler_state: restarted # Docker Compose Plugin options. -docker_install_compose_plugin: false +docker_install_compose_plugin: true docker_compose_package: docker-compose-plugin docker_compose_package_state: present # Docker Compose options. -docker_install_compose: true +docker_install_compose: false docker_compose_version: "v2.11.1" docker_compose_arch: "{{ ansible_architecture }}" docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}" @@ -36,9 +36,9 @@ docker_repo_url: https://download.docker.com/linux docker_apt_release_channel: stable docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}" docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" -docker_apt_filename: "" docker_apt_ignore_key_error: true docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" +docker_apt_filename: "docker" # Used only for RedHat/CentOS/Fedora. docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"