Skip to content

Commit

Permalink
Ensure that the docker config is picked up on systemD running Ubuntus…
Browse files Browse the repository at this point in the history
… (15.04 and greater)
  • Loading branch information
mrsheepuk committed Oct 1, 2015
1 parent a4188ac commit 56745cf
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@
- Reload docker
when: docker_opts != ""

- name: Ensure docker daemon options are picked up (systemd)
copy:
content: >
[Service]
EnvironmentFile=/etc/default/docker
dest: /etc/systemd/system/docker.service.d/DockerEnv.conf
owner: root
group: root
mode: 0644
notify:
- Reload docker
when: docker_opts != "" and ansible_distribution_version|version_compare(15.04, '>=')

- name: Fix DNS in docker.io
lineinfile:
dest: "{{ docker_defaults_file_path }}"
Expand Down

0 comments on commit 56745cf

Please sign in to comment.