From 6f4fa78c90d46155737e023ea1bddb00c5d72697 Mon Sep 17 00:00:00 2001 From: Felix Herzog Date: Fri, 6 Mar 2020 12:04:27 +0100 Subject: [PATCH] add changes from #170 in origin --- README.md | 4 ++-- defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bbd8c12..d595a83 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ Docker Compose installation options. docker_apt_release_channel: stable docker_apt_arch: amd64 - docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" + docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: True - docker_apt_gpg_key: https://download.docker.com/linux/ubuntu/gpg + docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_disztribution | lower }}/gpg (Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release. diff --git a/defaults/main.yml b/defaults/main.yml index 7fba2ba..166445d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -17,9 +17,9 @@ docker_compose_path: /usr/local/bin/docker-compose # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. docker_apt_release_channel: stable docker_apt_arch: amd64 -docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: true -docker_apt_gpg_key: https://download.docker.com/linux/ubuntu/gpg +docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg # Used only for RedHat/CentOS/Fedora. docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo