make optional to add the official docker repos

This commit is contained in:
sciCORE 2020-04-30 13:13:38 +02:00
parent c94e327a74
commit 5a35c06173
3 changed files with 58 additions and 44 deletions

View File

@ -15,6 +15,8 @@ docker_compose_version: "1.25.4"
docker_compose_path: /usr/local/bin/docker-compose 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 'edge' if needed.
docker_apt_add_official_repository: true
# options below apply if you add the official repo using this role (which is the default)
docker_apt_release_channel: stable docker_apt_release_channel: stable
docker_apt_arch: amd64 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_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
@ -22,6 +24,8 @@ docker_apt_ignore_key_error: true
docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg
# Used only for RedHat/CentOS/Fedora. # Used only for RedHat/CentOS/Fedora.
docker_yum_add_official_repository: true
# options below apply if you add the official repo using this role (which is the default)
docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo 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_edge: '0'
docker_yum_repo_enable_test: '0' docker_yum_repo_enable_test: '0'

View File

@ -14,27 +14,32 @@
- gnupg2 - gnupg2
state: present state: present
- name: Add Docker apt key. - name: Add official docker apt repository
apt_key: block:
url: "{{ docker_apt_gpg_key }}"
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). - name: Add Docker apt key.
package: name=curl state=present apt_key:
when: add_repository_key is failed url: "{{ docker_apt_gpg_key }}"
id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
state: present
register: add_repository_key
ignore_errors: "{{ docker_apt_ignore_key_error }}"
- name: Add Docker apt key (alternative for older systems without SNI). - name: Ensure curl is present (on older systems without SNI).
shell: > package: name=curl state=present
curl -sSL {{ docker_apt_gpg_key }} | sudo apt-key add - when: add_repository_key is failed
args:
warn: false
when: add_repository_key is failed
- name: Add Docker repository. - name: Add Docker apt key (alternative for older systems without SNI).
apt_repository: shell: >
repo: "{{ docker_apt_repository }}" curl -sSL {{ docker_apt_gpg_key }} | sudo apt-key add -
state: present args:
update_cache: true warn: false
when: add_repository_key is failed
- name: Add Docker repository.
apt_repository:
repo: "{{ docker_apt_repository }}"
state: present
update_cache: true
when: docker_apt_add_official_repository

View File

@ -7,32 +7,37 @@
- docker-engine - docker-engine
state: absent state: absent
- name: Add Docker GPG key. - name: Add official docker yum repository
rpm_key: block:
key: "{{ docker_yum_gpg_key }}"
state: present
- name: Add Docker repository. - name: Add Docker GPG key.
get_url: rpm_key:
url: "{{ docker_yum_repo_url }}" key: "{{ docker_yum_gpg_key }}"
dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo' state: present
owner: root
group: root
mode: 0644
- name: Configure Docker Edge repo. - name: Add Docker repository.
ini_file: get_url:
dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo' url: "{{ docker_yum_repo_url }}"
section: 'docker-{{ docker_edition }}-edge' dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
option: enabled owner: root
value: '{{ docker_yum_repo_enable_edge }}' group: root
mode: 0644
- name: Configure Docker Test repo. - name: Configure Docker Edge repo.
ini_file: ini_file:
dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo' dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
section: 'docker-{{ docker_edition }}-test' section: 'docker-{{ docker_edition }}-edge'
option: enabled option: enabled
value: '{{ docker_yum_repo_enable_test }}' value: '{{ docker_yum_repo_enable_edge }}'
- name: Configure Docker Test repo.
ini_file:
dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
section: 'docker-{{ docker_edition }}-test'
option: enabled
value: '{{ docker_yum_repo_enable_test }}'
when: docker_yum_add_official_repository
- name: Install containerd separately (CentOS 8). - name: Install containerd separately (CentOS 8).
package: package: