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 26e2764..d94fb18 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 }}" @@ -39,6 +39,7 @@ docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trust docker_apt_ignore_key_error: true docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" docker_apt_gpg_key_checksum: "sha256:1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570" +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" diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 55c8e62..846e796 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -50,5 +50,6 @@ apt_repository: repo: "{{ docker_apt_repository }}" state: present + filename: "{{ docker_apt_filename }}" update_cache: true when: docker_add_repo | bool