Browse Source

Use local gpg file for apt/yum

tags/0.0.1^2
Julien Cabillot 2 years ago
parent
commit
b725243ed6
2 changed files with 0 additions and 10 deletions
  1. +0
    -1
      defaults/main.yml
  2. +0
    -9
      tasks/setup-Debian.yml

+ 0
- 1
defaults/main.yml View File

@@ -18,7 +18,6 @@ docker_compose_path: /usr/local/bin/docker-compose
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

# 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


+ 0
- 9
tasks/setup-Debian.yml View File

@@ -19,20 +19,11 @@
id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
state: present
register: add_repository_key
ignore_errors: "{{ docker_apt_ignore_key_error }}"

- name: Ensure curl is present (on older systems without SNI).
package: name=curl state=present
when: add_repository_key is failed

- name: Add Docker apt key (alternative for older systems without SNI).
shell: |
set -o pipefail
curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
args:
warn: false
when: add_repository_key is failed

- name: Add Docker repository.
apt_repository:
repo: "{{ docker_apt_repository }}"


Loading…
Cancel
Save