From 7fb19e8f813efe706547778b6013e447817eae5e Mon Sep 17 00:00:00 2001
From: Marek Sirovy <msirovy@gmail.com>
Date: Tue, 23 Feb 2021 11:02:27 +0100
Subject: [PATCH 1/5] working and tested daemon.json settings

---
 defaults/main.yml        | 4 ++++
 tasks/main.yml           | 8 ++++++++
 templates/daemon.json.j2 | 1 +
 3 files changed, 13 insertions(+)
 create mode 100644 templates/daemon.json.j2

diff --git a/defaults/main.yml b/defaults/main.yml
index 8d66047..cdbc900 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,6 +4,10 @@ docker_edition: 'ce'
 docker_package: "docker-{{ docker_edition }}"
 docker_package_state: present
 
+# Docker daemon settings (generates /etc/docker/daemon.json)
+# docker_daemon_settings: 
+# root-dir: "/data/"
+
 # Service options.
 docker_service_state: started
 docker_service_enabled: true
diff --git a/tasks/main.yml b/tasks/main.yml
index 56449ef..13644e1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,6 +11,14 @@
     state: "{{ docker_package_state }}"
   notify: restart docker
 
+- name: Configure /etc/docker/daemon.json
+  template:
+    src: daemon.json.j2
+    dest: /etc/docker/daemon.json
+    mode: 0640
+  when: docker_daemon_settings is defined
+  notify: restart docker
+
 - name: Ensure Docker is started and enabled at boot.
   service:
     name: docker
diff --git a/templates/daemon.json.j2 b/templates/daemon.json.j2
new file mode 100644
index 0000000..60cebc7
--- /dev/null
+++ b/templates/daemon.json.j2
@@ -0,0 +1 @@
+{{ docker_daemon_settings | to_nice_json() }}

From 1be5608a53dd66dc32ae0e14e522034f7d201293 Mon Sep 17 00:00:00 2001
From: Marek Sirovy <msirovy@gmail.com>
Date: Tue, 23 Feb 2021 11:17:08 +0100
Subject: [PATCH 2/5] documentation

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 3090374..41773cf 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,14 @@ You can control whether the package is installed, uninstalled, or at the latest
 
 Variables to control the state of the `docker` service, and whether it should start on boot. If you're installing Docker inside a Docker container without systemd or sysvinit, you should set these to `stopped` and set the enabled variable to `no`.
 
+```yaml
+    docker_daemon_settings:
+        data-root: /data
+        debug: true
+```
+
+Configure /etc/docker/daemon.json for more options please read documentation there https://docs.docker.com/config/daemon/
+
     docker_install_compose: true
     docker_compose_version: "1.26.0"
     docker_compose_path: /usr/local/bin/docker-compose

From ccc31dda40bc545ac03fd429a89c60e8f62b989f Mon Sep 17 00:00:00 2001
From: Marek Sirovy <msirovy@gmail.com>
Date: Tue, 23 Feb 2021 11:26:28 +0100
Subject: [PATCH 3/5] pipefail linter error, syntax fix

---
 tasks/setup-Debian.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index d701135..aeaa841 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -23,11 +23,14 @@
   ignore_errors: "{{ docker_apt_ignore_key_error }}"
 
 - name: Ensure curl is present (on older systems without SNI).
-  package: name=curl state=present
+  package:
+    name: curl
+    state: present
   when: add_repository_key is failed
 
 - name: Add Docker apt key (alternative for older systems without SNI).
-  shell: >
+  shell: |
+    set -o pipefail
     curl -sSL {{ docker_apt_gpg_key }} | sudo apt-key add -
   args:
     warn: false

From 9a006413b5998a8b9f21edc325568227f8b338a2 Mon Sep 17 00:00:00 2001
From: Marek Sirovy <msirovy@gmail.com>
Date: Tue, 23 Feb 2021 11:41:19 +0100
Subject: [PATCH 4/5] linter fix

---
 defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index cdbc900..4d8428d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,7 +5,7 @@ docker_package: "docker-{{ docker_edition }}"
 docker_package_state: present
 
 # Docker daemon settings (generates /etc/docker/daemon.json)
-# docker_daemon_settings: 
+# docker_daemon_settings:
 # root-dir: "/data/"
 
 # Service options.

From 6f19a1ff121c7519e6644a649e8ec53ca5732894 Mon Sep 17 00:00:00 2001
From: Marek Sirovy <msirovy@gmail.com>
Date: Tue, 23 Feb 2021 11:42:26 +0100
Subject: [PATCH 5/5] readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 41773cf..4cbdfee 100644
--- a/README.md
+++ b/README.md
@@ -31,10 +31,11 @@ Variables to control the state of the `docker` service, and whether it should st
     docker_daemon_settings:
         data-root: /data
         debug: true
-```
 
+```
 Configure /etc/docker/daemon.json for more options please read documentation there https://docs.docker.com/config/daemon/
 
+
     docker_install_compose: true
     docker_compose_version: "1.26.0"
     docker_compose_path: /usr/local/bin/docker-compose