vagrant-docker-mirror-config 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9462220b04150afb1328b5c2a31bd975cd36afc
-  data.tar.gz: db95ea00841ae1812c2c1ce2aefc097c1471049a
+  metadata.gz: cb9676f204982f48a8ab97b94d7f1d894511a37e
+  data.tar.gz: 0e007f58482d2f0f0cca433ee39cb250ae1eb619
 SHA512:
-  metadata.gz: 2df702a31aeecd424f42549686ab6873025599d078a7101f0f032f9bc261d44178df1a1649e92fd03d1a35b1db85063afe8bf47a28a98b38a622d550f0624b69
-  data.tar.gz: 65dfc13dc5f8e3b56cf30a1a99606ebda1c95a5ee02407dcf5d713563213e6f20a6785e00e59ce2c0cd081ec2de46ef0eaa0b415588de8607488fa8cdea8049a
+  metadata.gz: ef68793aa622a1eaf5532faed2c20857aab7c0d84aa8e678af9556489a5cde0dc1f958ba0c607ec7febb3c5f61f7ff6ea2bd6f365b6cfb5400620cf551d4e6e2
+  data.tar.gz: 5163a581ba02be45c2e7bb6c0354147ea119e5800455c835baf71a8582a65d3c5acb4b93957f111148ee460fd1444616996e901f70254d580efd4ab5a5db202d

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", tag: "v1.8.4"
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", tag: "v1.8.5"
   gem "rake"
 end
 

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

@@ -1,4 +1,6 @@
 require "pathname"
+require "json"
+require "vagrant/util/downloader"
 
 module VagrantPlugins
   module DockerMirrorConfigProvisioner
@@ -10,18 +12,19 @@ module VagrantPlugins
 
       def configure
         @machine.communicate.tap do |comm|
-          #comm.sudo("cp /lib/systemd/system/docker.service /etc/systemd/system/docker.service")
-          comm.sudo("mkdir -p /etc/systemd/system/docker.service.d/")
-          comm.sudo("mkdir -p /etc/sysconfig")
-          options = "DOCKER_OPTS=\""
-          options += " --registry-mirror #{@config.scheme}://#{@config.host}:#{@config.port}"
-          options += " --insecure-registry #{@config.host}:#{@config.port}" if @config.insecure
-          options += "\""
-          comm.sudo("echo #{options} > /etc/sysconfig/docker")
-          comm.sudo("echo [Service] > /etc/systemd/system/docker.service.d/docker.conf")
-          comm.sudo("echo EnvironmentFile=-/etc/sysconfig/docker >> /etc/systemd/system/docker.service.d/docker.conf")
-          comm.sudo("echo ExecStart= >> /etc/systemd/system/docker.service.d/docker.conf")
-          comm.sudo("echo ExecStart=/usr/bin/docker daemon -H fd:// \\\$DOCKER_OPTS >> /etc/systemd/system/docker.service.d/docker.conf")
+          if comm.test("cat /etc/docker/daemon.json 2>&1")
+            json = comm.sudo("cat /etc/docker/daemon.json 2>&1")
+            json = json.parse(json)
+          else
+            json = {}
+          end
+          json["registry-mirrors"] = [] if not json['registry-mirrors']
+          json["registry-mirrors"].insert(0, "#{@config.scheme}://#{@config.host}:#{@config.port}")
+          json["insecure-registries"] = [] if not json['insecure-registries'] && @config.insecure
+          json["insecure-registries"].insert(0, "#{@config.host}:#{@config.port}") if @config.insecure
+          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")
           comm.sudo("systemctl daemon-reload")
           comm.sudo("systemctl restart docker")
         end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-mirror-config
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Geoffrey Ragot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant provisioner for configuring mirror for docker.
 email: