From a82d49f3f55dcadac9c000b447369ed06805dc7a Mon Sep 17 00:00:00 2001 From: Julien Lecomte Date: Sat, 1 Dec 2018 11:20:36 +0100 Subject: [PATCH] Fixes #101, Add docker-apt-filename variable to control sources.list filename --- 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 9a49840..b02ecec 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ Docker Compose installation options. 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_ignore_key_error: True + docker_apt_filename: (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 2bcb620..dadeec1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,6 +19,7 @@ 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_ignore_key_error: true +docker_apt_filename: # 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 diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 23a49ae..83c74de 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -36,3 +36,4 @@ repo: "{{ docker_apt_repository }}" state: present update_cache: true + filename: "{{ docker_apt_filename }}"