From 33afdbb0f828a8bf805e451293d9a540a7bf6361 Mon Sep 17 00:00:00 2001
From: Ricky Kwan <rickyk.162@gmail.com>
Date: Mon, 8 Oct 2018 18:53:22 +0000
Subject: [PATCH 1/2] Ability to configure Docker daemon options

---
 README.md         |  7 +++++++
 defaults/main.yml |  3 +++
 tasks/main.yml    | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/README.md b/README.md
index 9a498405..c34b8de5 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,13 @@ Docker Compose installation options.
 
 A list of system users to be added to the `docker` group (so they can use Docker on the server).
 
+    docker_daemon_options:
+      storage-driver: "devicemapper"
+      log-opts:
+        max-size: "100m"
+
+Custom `dockerd` options can be configured through this dictionary representing the json file `/etc/docker/daemon.json`.
+
 ## Use with Ansible (and `docker` Python library)
 
 Many users of this role wish to also use Ansible to then _build_ Docker images and manage Docker containers on the server where Docker is installed. In this case, you can easily add in the `docker` Python library using the `geerlingguy.pip` role:
diff --git a/defaults/main.yml b/defaults/main.yml
index 2bcb620e..51e11ae7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -27,3 +27,6 @@ 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: {}
diff --git a/tasks/main.yml b/tasks/main.yml
index 8444ac74..1a0de123 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,6 +17,18 @@
     state: "{{ docker_service_state }}"
     enabled: "{{ docker_service_enabled }}"
 
+- name: Ensure /etc/docker/ directory exists.
+  file:
+    path: /etc/docker
+    state: directory
+
+- name: Configure docker daemon options.
+  copy:
+    content: "{{ docker_daemon_options | to_nice_json }}"
+    dest: /etc/docker/daemon.json
+    mode: 0644
+  notify: restart docker
+
 - name: Ensure handlers are notified now to avoid firewall conflicts.
   meta: flush_handlers
 

From 0df75aea533f3295679c136371b610d26efbe0bf Mon Sep 17 00:00:00 2001
From: Ricky Kwan <rickyk.162@gmail.com>
Date: Mon, 8 Oct 2018 22:07:15 -0400
Subject: [PATCH 2/2] Capitalize 'docker' in the task name

Since most other instances are capitalized
---
 tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 1a0de123..c357ca3a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,7 +22,7 @@
     path: /etc/docker
     state: directory
 
-- name: Configure docker daemon options.
+- name: Configure Docker daemon options.
   copy:
     content: "{{ docker_daemon_options | to_nice_json }}"
     dest: /etc/docker/daemon.json