Skip to content

Commit

Permalink
docker: user customization daemon.json.j2
Browse files Browse the repository at this point in the history
  • Loading branch information
khartahk committed Nov 11, 2021
1 parent 647aa8d commit 1c4a22d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
6 changes: 6 additions & 0 deletions roles/ansible-nas-docker/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@ docker_image_directory: "{{ docker_home }}/data"
# Docker storage driver, see https://docs.docker.com/storage/storagedriver/select-storage-driver/#supported-backing-filesystems
# You might want to change this to ZFS, depending on your underlying filesystem.
docker_storage_driver: overlay2

# Docker daemon configuration options added to /etc/docker/daemon.json
docker_daemon_json:
- '"data-root": "{{ docker_image_directory }}"'
- '"storage-driver": "{{ docker_storage_driver }}"'

6 changes: 5 additions & 1 deletion roles/ansible-nas-docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@

- name: Update Docker home from install default
template:
src: daemon.json
src: daemon.json.j2
dest: /etc/docker/daemon.json
register: docker_config
vars:
items: "{{ docker_daemon_json }}"
tags:
- ansible-nas-docker:daemon_json

- name: Restart Docker
service:
Expand Down
4 changes: 0 additions & 4 deletions roles/ansible-nas-docker/templates/daemon.json

This file was deleted.

3 changes: 3 additions & 0 deletions roles/ansible-nas-docker/templates/daemon.json.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
{{ items|join(",\n ") }}
}

0 comments on commit 1c4a22d

Please sign in to comment.