From 60f58ad45b8397eb51187944fffa1e470b5aa6b5 Mon Sep 17 00:00:00 2001 From: thiuda Date: Thu, 3 Jun 2021 17:59:34 +0200 Subject: [PATCH 1/4] Added optional change of docker root dir --- defaults/main.yml | 2 ++ tasks/main.yml | 8 ++++++++ templates/daemon.json.j2 | 3 +++ 3 files changed, 13 insertions(+) create mode 100644 defaults/main.yml create mode 100644 templates/daemon.json.j2 diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..3ec140c --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,2 @@ +change_docker_root: false +docker_root: /home/docker diff --git a/tasks/main.yml b/tasks/main.yml index d12945a..cb126cb 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -43,3 +43,11 @@ executable: pip3 name: - docker + +- name: Change docker root + become: yes + template: + src: templates/daemon.json.j2 + dest: /etc/docker/daemon.json + mode: 0644 + when: change_docker_root diff --git a/templates/daemon.json.j2 b/templates/daemon.json.j2 new file mode 100644 index 0000000..d0eabb8 --- /dev/null +++ b/templates/daemon.json.j2 @@ -0,0 +1,3 @@ +{ + "data-root": "{{ docker_root }}" +} \ No newline at end of file From f618c42d15f4ec3e5cba0b88738d5ebe9d5f65be Mon Sep 17 00:00:00 2001 From: thiuda Date: Thu, 3 Jun 2021 20:41:12 +0200 Subject: [PATCH 2/4] Changed default value to jinja2 default vars --- defaults/main.yml | 2 -- tasks/main.yml | 1 - templates/daemon.json.j2 | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 defaults/main.yml diff --git a/defaults/main.yml b/defaults/main.yml deleted file mode 100644 index 3ec140c..0000000 --- a/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -change_docker_root: false -docker_root: /home/docker diff --git a/tasks/main.yml b/tasks/main.yml index cb126cb..5cbd3bc 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -50,4 +50,3 @@ src: templates/daemon.json.j2 dest: /etc/docker/daemon.json mode: 0644 - when: change_docker_root diff --git a/templates/daemon.json.j2 b/templates/daemon.json.j2 index d0eabb8..9d37e03 100644 --- a/templates/daemon.json.j2 +++ b/templates/daemon.json.j2 @@ -1,3 +1,3 @@ { - "data-root": "{{ docker_root }}" + "data-root": "{{ docker_root | default(/var/lib/docker) }}" } \ No newline at end of file From a94d4eff405300a03a50f847d7a870a9282c7ee9 Mon Sep 17 00:00:00 2001 From: thiuda Date: Thu, 3 Jun 2021 20:43:20 +0200 Subject: [PATCH 3/4] Added '' around default value --- templates/daemon.json.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/daemon.json.j2 b/templates/daemon.json.j2 index 9d37e03..de96ca5 100644 --- a/templates/daemon.json.j2 +++ b/templates/daemon.json.j2 @@ -1,3 +1,3 @@ { - "data-root": "{{ docker_root | default(/var/lib/docker) }}" + "data-root": "{{ docker_root | default("/var/lib/docker") }}" } \ No newline at end of file From 131e642a6173848e9348325212fb71a641003aaf Mon Sep 17 00:00:00 2001 From: thiuda Date: Thu, 3 Jun 2021 20:43:52 +0200 Subject: [PATCH 4/4] Added '' around default value --- templates/daemon.json.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/daemon.json.j2 b/templates/daemon.json.j2 index de96ca5..ddebedc 100644 --- a/templates/daemon.json.j2 +++ b/templates/daemon.json.j2 @@ -1,3 +1,3 @@ { - "data-root": "{{ docker_root | default("/var/lib/docker") }}" + "data-root": "{{ docker_root | default('/var/lib/docker') }}" } \ No newline at end of file