vagrant-docker-mirror-config 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb9676f204982f48a8ab97b94d7f1d894511a37e
-  data.tar.gz: 0e007f58482d2f0f0cca433ee39cb250ae1eb619
+  metadata.gz: 383ec167dd125a14982c8202369009c7142831d9
+  data.tar.gz: 24e5fe8212625785a4dafa3a59de7badc62ef734
 SHA512:
-  metadata.gz: ef68793aa622a1eaf5532faed2c20857aab7c0d84aa8e678af9556489a5cde0dc1f958ba0c607ec7febb3c5f61f7ff6ea2bd6f365b6cfb5400620cf551d4e6e2
-  data.tar.gz: 5163a581ba02be45c2e7bb6c0354147ea119e5800455c835baf71a8582a65d3c5acb4b93957f111148ee460fd1444616996e901f70254d580efd4ab5a5db202d
+  metadata.gz: b76b1314bc2611f458a3a8a5ca5a79f16a9c207d06e7ef30d00e19a1bf41e66d8969148830b3dcc4509ef31a5af74989a8e4fd541d0dea14e6cfece460febc9b
+  data.tar.gz: 401f701f3f5abc48c380653b5a6df663fd58fedfd126cd3c2a7303e4988a99e689b85729c38b216170bc47dd789ffb3b37a1236c84076884d05cb725a3131efe

data/lib/vagrant-docker-mirror-config/docker_mirror_config.rb

@@ -12,16 +12,21 @@ module VagrantPlugins
 
       def configure
         @machine.communicate.tap do |comm|
-          if comm.test("cat /etc/docker/daemon.json 2>&1")
-            json = comm.sudo("cat /etc/docker/daemon.json 2>&1")
-            json = json.parse(json)
+          json = nil
+          if comm.test("test -f /etc/docker/daemon.json", { :sudo => true })
+            comm.sudo("cat /etc/docker/daemon.json", { :shell => "/bin/sh" }) do |type, data|
+              json = JSON.parse(data)
+            end
           else
             json = {}
           end
+          registryMirror = "#{@config.scheme}://#{@config.host}:#{@config.port}"
+          insecureHost= "#{@config.host}:#{@config.port}"
+
           json["registry-mirrors"] = [] if not json['registry-mirrors']
-          json["registry-mirrors"].insert(0, "#{@config.scheme}://#{@config.host}:#{@config.port}")
+          json["registry-mirrors"].insert(0, "#{@config.scheme}://#{@config.host}:#{@config.port}") if not json["registry-mirrors"].include? registryMirror
           json["insecure-registries"] = [] if not json['insecure-registries'] && @config.insecure
-          json["insecure-registries"].insert(0, "#{@config.host}:#{@config.port}") if @config.insecure
+          json["insecure-registries"].insert(0, "#{@config.host}:#{@config.port}") if @config.insecure if not json["insecure-registries"].include? insecureHost
           File.open("/tmp/daemon.json", 'w') { |file| file.write(JSON.pretty_generate(json)) }
           comm.upload("/tmp/daemon.json", "/tmp/daemon.json")
           comm.sudo("mv /tmp/daemon.json /etc/docker/daemon.json")

data/lib/vagrant-docker-mirror-config/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerMirrorConfigProvisioner
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-mirror-config
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Geoffrey Ragot