Merge pull request #284 from danny-smit/tests-for-daemon-json-file

fix(config): remove daemon.json in clean states

Author: myii

docker/software/config/clean.sls

@@ -16,5 +16,6 @@ include:
     - names:
       - {{ d.pkg.docker.config_file }}
       - {{ d.pkg.docker.environ_file }}
+      - {{ d.pkg.docker.daemon_config_file }}
     - require:
       - sls: {{ sls_archive_clean if d.pkg.docker.use_upstream == 'archive' else sls_package_clean }}

pillar.example

@@ -17,6 +17,7 @@ docker:
         # yamllint enable-line rule:line-length
         - DOCKER_OPTS="-s btrfs --dns 8.8.8.8"
         - export http_proxy="http://172.17.42.1:3128"
+      daemon_config: {}
 
   networks:
     - nginxnet

test/integration/archive/controls/config.rb

@@ -11,4 +11,7 @@
     its('content') { should include 'DOCKER_OPTS="-s btrfs --dns 8.8.8.8"' }
     its('content') { should include 'export http_proxy="http://172.17.42.1:3128"' }
   end
+  describe file('/etc/docker/daemon.json') do
+    it { should_not exist }
+  end
 end

test/integration/clean/controls/config.rb

@@ -6,4 +6,7 @@
   describe file('/etc/default/docker') do
     it { should_not exist }
   end
+  describe file('/etc/docker/daemon.json') do
+    it { should_not exist }
+  end
 end

test/integration/package/controls/config.rb

@@ -11,4 +11,11 @@
     its('content') { should include 'DOCKER_OPTS="-s btrfs --dns 8.8.8.8"' }
     its('content') { should include 'export http_proxy="http://172.17.42.1:3128"' }
   end
+  describe file('/etc/docker/daemon.json') do
+    it { should be_file }
+    its('owner') { should eq 'root' }
+    its('group') { should eq 'root' }
+    its('mode')  { should cmp '0640' }
+    its('content') { should include '"insecure-registries": []' }
+  end
 end

test/salt/pillar/package.sls

@@ -17,6 +17,8 @@ docker:
         # yamllint disable-line rule:line-length
         - DOCKER_OPTS="-s btrfs --dns 8.8.8.8"
         - export http_proxy="http://172.17.42.1:3128"
+      daemon_config:
+        insecure-registries: []
 
   containers:
     running: