Skip to content

Commit

Permalink
Do not touch docker.json if not option provided
Browse files Browse the repository at this point in the history
  • Loading branch information
Zempashi committed Feb 2, 2021
1 parent 0df75ae commit a734402
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ docker_yum_repo_enable_test: 0
# A list of users who will be added to the docker group.
docker_users: []

# Docker daemon options
docker_daemon_options: {}
# Docker daemon options as a dict
docker_daemon_options:
14 changes: 8 additions & 6 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,26 @@
state: "{{ docker_package_state }}"
notify: restart docker

- name: Ensure Docker is started and enabled at boot.
service:
name: docker
state: "{{ docker_service_state }}"
enabled: "{{ docker_service_enabled }}"

- name: Ensure /etc/docker/ directory exists.
file:
path: /etc/docker
state: directory
when: docker_daemon_options is not none

- name: Configure Docker daemon options.
copy:
content: "{{ docker_daemon_options | to_nice_json }}"
dest: /etc/docker/daemon.json
mode: 0644
when: docker_daemon_options is not none
notify: restart docker

- name: Ensure Docker is started and enabled at boot.
service:
name: docker
state: "{{ docker_service_state }}"
enabled: "{{ docker_service_enabled }}"

- name: Ensure handlers are notified now to avoid firewall conflicts.
meta: flush_handlers

Expand Down

0 comments on commit a734402

Please sign in to comment.