Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2025-09-26 17:51:03 +02:00
Code Issues Projects Releases Wiki Activity

change proxy_env to proxy_env|default('')

Browse Source
This commit is contained in:
Anton Patsev 2018-11-21 23:54:37 +06:00
parent a6ab775c40
commit cb362c27ee
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/docker-compose.yml
View File

@ -19,4 +19,4 @@
dest: "{{ docker_compose_path }}" dest: "{{ docker_compose_path }}"
mode: 0755 mode: 0755
become: true become: true
environment: "{{ proxy_env }}" environment: "{{ proxy_env|default('') }}"

2
tasks/main.yml
View File

@ -11,7 +11,7 @@
state: "{{ docker_package_state }}" state: "{{ docker_package_state }}"
notify: restart docker notify: restart docker
become: true become: true
environment: "{{ proxy_env }}" environment: "{{ proxy_env|default('') }}"
# TODO: Remove this shim once 18.09.1 or later is released. # TODO: Remove this shim once 18.09.1 or later is released.
- import_tasks: docker-1809-shim.yml - import_tasks: docker-1809-shim.yml

4
tasks/setup-RedHat.yml
View File

@ -12,7 +12,7 @@
key: https://download.docker.com/linux/centos/gpg key: https://download.docker.com/linux/centos/gpg
state: present state: present
become: true become: true
environment: "{{ proxy_env }}" environment: "{{ proxy_env|default('') }}"
- name: Add Docker repository. - name: Add Docker repository.
get_url: get_url:
@ -22,7 +22,7 @@
group: root group: root
mode: 0644 mode: 0644
become: true become: true
environment: "{{ proxy_env }}" environment: "{{ proxy_env|default('') }}"
- name: Configure Docker Edge repo. - name: Configure Docker Edge repo.
ini_file: ini_file: