From 6daa4c52e574a52576636613436144d3f67e9773 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Sun, 27 Dec 2020 00:14:37 -0600 Subject: [PATCH] Fixes #239: Switch from 'Edge' to 'Nightly' option since Edge is not a thing now. --- README.md | 6 +++--- defaults/main.yml | 4 ++-- tasks/setup-RedHat.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f2e7dc9..3090374 100644 --- a/README.md +++ b/README.md @@ -39,17 +39,17 @@ Docker Compose installation options. docker_apt_ignore_key_error: True docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg -(Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release. +(Used only for Debian/Ubuntu.) You can switch the channel to `nightly` if you want to use the Nightly release. You can change `docker_apt_gpg_key` to a different url if you are behind a firewall or provide a trustworthy mirror. Usually in combination with changing `docker_apt_repository` as well. docker_yum_repo_url: https://download.docker.com/linux/centos/docker-{{ docker_edition }}.repo - docker_yum_repo_enable_edge: '0' + docker_yum_repo_enable_nightly: '0' docker_yum_repo_enable_test: '0' docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg -(Used only for RedHat/CentOS.) You can enable the Edge or Test repo by setting the respective vars to `1`. +(Used only for RedHat/CentOS.) You can enable the Nightly or Test repo by setting the respective vars to `1`. You can change `docker_yum_gpg_key` to a different url if you are behind a firewall or provide a trustworthy mirror. Usually in combination with changing `docker_yum_repository` as well. diff --git a/defaults/main.yml b/defaults/main.yml index fc8d79e..8d66047 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,7 +14,7 @@ docker_install_compose: true docker_compose_version: "1.26.0" docker_compose_path: /usr/local/bin/docker-compose -# Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. +# Used only for Debian/Ubuntu. Switch 'stable' to 'nightly' 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 }}" @@ -23,7 +23,7 @@ docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_distribution | # 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 -docker_yum_repo_enable_edge: '0' +docker_yum_repo_enable_nightly: '0' docker_yum_repo_enable_test: '0' docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 3ff14b0..9607238 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -20,12 +20,12 @@ group: root mode: 0644 -- name: Configure Docker Edge repo. +- name: Configure Docker Nightly repo. ini_file: dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo' - section: 'docker-{{ docker_edition }}-edge' + section: 'docker-{{ docker_edition }}-nightly' option: enabled - value: '{{ docker_yum_repo_enable_edge }}' + value: '{{ docker_yum_repo_enable_nightly }}' mode: 0644 - name: Configure Docker Test repo.