mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2025-09-26 17:51:03 +02:00
Added environment proxy_env, become: yes for some tasks
This commit is contained in:
parent
fa1a56824e
commit
312abbd14f
@ -3,14 +3,17 @@
|
||||
file:
|
||||
path: /etc/systemd/system/containerd.service.d
|
||||
state: directory
|
||||
become: yes
|
||||
|
||||
- name: Add shim to ensure Docker can start in all environments.
|
||||
template:
|
||||
src: override.conf.j2
|
||||
dest: /etc/systemd/system/containerd.service.d/override.conf
|
||||
register: override_template
|
||||
become: yes
|
||||
|
||||
- name: Reload systemd daemon if template is changed.
|
||||
systemd:
|
||||
daemon_reload: true
|
||||
when: override_template is changed
|
||||
become: yes
|
||||
|
@ -18,3 +18,5 @@
|
||||
url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64
|
||||
dest: "{{ docker_compose_path }}"
|
||||
mode: 0755
|
||||
become: yes
|
||||
environment: "{{ proxy_env }}"
|
||||
|
@ -10,6 +10,8 @@
|
||||
name: "{{ docker_package }}"
|
||||
state: "{{ docker_package_state }}"
|
||||
notify: restart docker
|
||||
become: yes
|
||||
environment: "{{ proxy_env }}"
|
||||
|
||||
# TODO: Remove this shim once 18.09.1 or later is released.
|
||||
- import_tasks: docker-1809-shim.yml
|
||||
@ -20,6 +22,7 @@
|
||||
name: docker
|
||||
state: "{{ docker_service_state }}"
|
||||
enabled: "{{ docker_service_enabled }}"
|
||||
become: yes
|
||||
|
||||
- name: Ensure handlers are notified now to avoid firewall conflicts.
|
||||
meta: flush_handlers
|
||||
|
@ -11,6 +11,8 @@
|
||||
rpm_key:
|
||||
key: https://download.docker.com/linux/centos/gpg
|
||||
state: present
|
||||
become: yes
|
||||
environment: "{{ proxy_env }}"
|
||||
|
||||
- name: Add Docker repository.
|
||||
get_url:
|
||||
@ -19,6 +21,8 @@
|
||||
owner: root
|
||||
group: root
|
||||
mode: 0644
|
||||
become: yes
|
||||
environment: "{{ proxy_env }}"
|
||||
|
||||
- name: Configure Docker Edge repo.
|
||||
ini_file:
|
||||
@ -26,6 +30,7 @@
|
||||
section: 'docker-{{ docker_edition }}-edge'
|
||||
option: enabled
|
||||
value: '{{ docker_yum_repo_enable_edge }}'
|
||||
become: yes
|
||||
|
||||
- name: Configure Docker Test repo.
|
||||
ini_file:
|
||||
@ -33,3 +38,4 @@
|
||||
section: 'docker-{{ docker_edition }}-test'
|
||||
option: enabled
|
||||
value: '{{ docker_yum_repo_enable_test }}'
|
||||
become: yes
|
||||
|
Loading…
Reference in New Issue
Block a user