docker: remove dockerproject repo reference
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
parent
16a34548ea
commit
de6c71a426
4 changed files with 0 additions and 60 deletions
|
@ -12,12 +12,6 @@ docker_repo_key_info:
|
||||||
docker_repo_info:
|
docker_repo_info:
|
||||||
repos:
|
repos:
|
||||||
|
|
||||||
dockerproject_repo_key_info:
|
|
||||||
repo_keys:
|
|
||||||
|
|
||||||
dockerproject_repo_info:
|
|
||||||
repos:
|
|
||||||
|
|
||||||
docker_cgroup_driver: systemd
|
docker_cgroup_driver: systemd
|
||||||
|
|
||||||
docker_dns_servers_strict: true
|
docker_dns_servers_strict: true
|
||||||
|
|
|
@ -85,32 +85,6 @@
|
||||||
with_items: "{{ docker_repo_info.repos }}"
|
with_items: "{{ docker_repo_info.repos }}"
|
||||||
when: not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree) and (docker_repo_info.repos|length > 0)
|
when: not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree) and (docker_repo_info.repos|length > 0)
|
||||||
|
|
||||||
- name: ensure docker-engine repository public key is installed
|
|
||||||
action: "{{ dockerproject_repo_key_info.pkg_key }}"
|
|
||||||
args:
|
|
||||||
id: "{{ item }}"
|
|
||||||
url: "{{ dockerproject_repo_key_info.url }}"
|
|
||||||
state: present
|
|
||||||
register: keyserver_task_result
|
|
||||||
until: keyserver_task_result is succeeded
|
|
||||||
retries: 4
|
|
||||||
delay: "{{ retry_stagger | d(3) }}"
|
|
||||||
with_items: "{{ dockerproject_repo_key_info.repo_keys }}"
|
|
||||||
environment: "{{ proxy_env }}"
|
|
||||||
when:
|
|
||||||
- not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree)
|
|
||||||
- use_docker_engine is defined and use_docker_engine
|
|
||||||
|
|
||||||
- name: ensure docker-engine repository is enabled
|
|
||||||
action: "{{ dockerproject_repo_info.pkg_repo }}"
|
|
||||||
args:
|
|
||||||
repo: "{{ item }}"
|
|
||||||
state: present
|
|
||||||
with_items: "{{ dockerproject_repo_info.repos }}"
|
|
||||||
when:
|
|
||||||
- use_docker_engine is defined and use_docker_engine
|
|
||||||
- not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree) and (dockerproject_repo_info.repos|length > 0)
|
|
||||||
|
|
||||||
- name: Configure docker repository on Fedora
|
- name: Configure docker repository on Fedora
|
||||||
template:
|
template:
|
||||||
src: "fedora_docker.repo.j2"
|
src: "fedora_docker.repo.j2"
|
||||||
|
|
|
@ -46,17 +46,3 @@ docker_repo_info:
|
||||||
deb {{ docker_debian_repo_base_url }}
|
deb {{ docker_debian_repo_base_url }}
|
||||||
{{ ansible_distribution_release|lower }}
|
{{ ansible_distribution_release|lower }}
|
||||||
stable
|
stable
|
||||||
|
|
||||||
dockerproject_repo_key_info:
|
|
||||||
pkg_key: apt_key
|
|
||||||
url: '{{ docker_debian_repo_gpgkey }}'
|
|
||||||
repo_keys:
|
|
||||||
- 58118E89F3A912897C070ADBF76221572C52609D
|
|
||||||
|
|
||||||
dockerproject_repo_info:
|
|
||||||
pkg_repo: apt_repository
|
|
||||||
repos:
|
|
||||||
- >
|
|
||||||
deb {{ docker_debian_repo_base_url }}
|
|
||||||
{{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
|
|
||||||
main
|
|
||||||
|
|
|
@ -41,17 +41,3 @@ docker_repo_info:
|
||||||
deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
|
deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
|
||||||
{{ ansible_distribution_release|lower }}
|
{{ ansible_distribution_release|lower }}
|
||||||
stable
|
stable
|
||||||
|
|
||||||
dockerproject_repo_key_info:
|
|
||||||
pkg_key: apt_key
|
|
||||||
url: '{{ docker_ubuntu_repo_gpgkey }}'
|
|
||||||
repo_keys:
|
|
||||||
- 58118E89F3A912897C070ADBF76221572C52609D
|
|
||||||
|
|
||||||
dockerproject_repo_info:
|
|
||||||
pkg_repo: apt_repository
|
|
||||||
repos:
|
|
||||||
- >
|
|
||||||
deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
|
|
||||||
{{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
|
|
||||||
main
|
|
||||||
|
|
Loading…
Reference in a new issue