fix(config): write config dictionary to daemon.json

saltstack-formulas · Apr 20, 2021 · 413cf58 · 413cf58
1 parent 3d002dd
commit 413cf58
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/docker/defaults.yaml b/docker/defaults.yaml
@@ -32,7 +32,7 @@ docker:
 
     docker:
       version: '19.03.9'  # archive package version
-      config_file: /etc/default/docker   # /etc/docker/daemon.json
+      config_file: /etc/docker/daemon.json
       config: {}
       environ_file: /etc/default/docker
       environ: {}

diff --git a/docker/files/default/daemon.json.jinja b/docker/files/default/daemon.json.jinja
@@ -0,0 +1,8 @@
+########################################################################
+# File managed by Salt at <{{ source }}>.
+# Your changes may be overwritten.
+########################################################################
+
+{%- if config %}
+{{ config|json(indent=2) }}
+{%- endif %}
diff --git a/docker/software/config/file.sls b/docker/software/config/file.sls
@@ -17,7 +17,7 @@ include:
 {{ formula }}-software-config-file-managed-config_file:
   file.managed:
     - name: {{ d.pkg.docker.config_file }}
-    - source: {{ files_switch(['config.sh.jinja'],
+    - source: {{ files_switch(['daemon.json.jinja'],
                               lookup=formula ~ '-software-config-file-managed-config_file'
                  )
               }}