From e0f4ccd075d52de35514402cca55c83e66355567 Mon Sep 17 00:00:00 2001 From: sgrimm-sg Date: Fri, 11 May 2018 12:04:18 -0700 Subject: [PATCH] Allow selection of apt channel (#211) * Allow selection of apt channel This allows easier installation of nightly or edge releases. * Clarify why you might want a different apt channel --- defaults/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9dbd660..91c46d0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,6 +6,11 @@ uninstall_previous_docker_versions: false # assume that the desired version is community edition docker_edition: ce +# Which channel to pull from the apt repository; "edge" gets releases for new OS versions before +# "stable" does, so if your OS isn't supported in "stable" you might still be able to install by +# changing this to "edge". Other channels include "test" and "nightly". +docker_apt_channel: stable + # docker-ce is the default package name docker_pkg_name: "{{ 'docker-ee' if docker_edition == 'ee' else 'docker-ce' }}" docker_apt_cache_valid_time: 600 @@ -27,7 +32,7 @@ apt_key_sig: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 keyring: "/etc/apt/trusted.gpg.d/docker.gpg" # Name of the apt repository for Docker CE or EE apt_repository_arch: "amd64" -apt_repository: "deb [arch={{ apt_repository_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }} stable" +apt_repository: "deb [arch={{ apt_repository_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }} {{ docker_apt_channel }}" # daemon_json allows you to configure the daemon with the daemon.json file. # https://docs.docker.com/engine/reference/commandline/dockerd/#on-linux