chef-provisioning-docker 1.0.0.beta.2 → 1.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08110106616725e446a740a4a3a309ab9afca476
-  data.tar.gz: d35e453ec12ac3b2a2fcb33999fcb4d3014d3fc3
+  metadata.gz: de2e1b506ecac1d6dd61ca787b3339e85cced92f
+  data.tar.gz: cc90ea490c81250ff1c43c560bd0554357430879
 SHA512:
-  metadata.gz: 664c9d9ff139e4f84425b2f5561053c4bf7da9fc610d280830575dcf768401a1febfc84a2c7fb4d3d3aebc1adbd3ca7d66a530a4b44488757ea49e009f13bb05
-  data.tar.gz: 81605d7138ce4f1b95a7725ec4748af023811c768bfd181676a94b9fd680b258ad01879292f0897a6fbce56d4a1f4e077f1d43d2ef0ee0318f0cd040fcf1132e
+  metadata.gz: fa6147b7851e58ce5ff90c36e9e85defbddd796ff8539d798e0b0abfa6da5c223e3e1506cfd638009c88332bff5b29d91994f3911740b2e7599dd2f37cdfe8e5
+  data.tar.gz: dfe8d1b87314a24aa8c68dbbd8c592d822c8c84a69b49337ef3b9a5db1381d885acb5166f0170ba38f2c067efb62a35a278ac5b957134d9771e5c8db3d151b1c

data/README.md

@@ -96,5 +96,5 @@ end
 ```
 
 This will create a docker container based on Ubuntu 14.04 and
-then execute the Apache recipe and run the /usr/sbin/httpd command
+then execute the openssh recipe and run the /usr/sbin/sshd command
 as the container's run command.

data/lib/chef/provisioning/docker_driver/docker_run_options.rb

@@ -517,8 +517,10 @@ class DockerRunOptions
       config["HostConfig"]["Binds"] ||= []
       config["HostConfig"]["Binds"] += binds
     end
-    config["Volumes"] ||= []
-    config["Volumes"] += volumes
+    unless volumes.empty?
+      config["Volumes"] ||= []
+      config["Volumes"] += volumes
+    end
   end
   #   --volume-driver=""            Container's volume driver
   cli_option :volume_driver,       api: "HostConfig/VolumeDriver"

data/lib/chef/provisioning/docker_driver/docker_transport.rb

@@ -81,7 +81,7 @@ module DockerDriver
     end
 
     def download_file(path, local_path)
-      file = File.open(local_path, 'w')
+      file = File.open(local_path, 'wb')
       begin
         file.write(read_file(path))
         file.close
@@ -91,7 +91,7 @@ module DockerDriver
     end
 
     def upload_file(local_path, path)
-      write_file(path, IO.read(local_path))
+      write_file(path, IO.read(local_path, mode: "rb"))
     end
 
     def make_url_available_to_remote(local_url)
@@ -146,13 +146,6 @@ module DockerDriver
           end
 
         end
-      else
-        old_uri = uri.dup
-        # Find out our external network address of the URL and report it
-        # to the container in case it has no DNS (often the case).
-        uri.scheme = 'http' if 'chefzero' == uri.scheme && uri.host == 'localhost'
-        uri.host = Socket.getaddrinfo(uri.host, uri.scheme, nil, :STREAM)[0][3]
-        Chef::Log.debug("Looked up IP address of #{old_uri} and modified URL to point at it: #{uri}")
       end
 
       uri.to_s

data/lib/chef/provisioning/docker_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module DockerDriver
-  VERSION = '1.0.0.beta.2'
+  VERSION = '1.0.0.beta.3'
 end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-docker
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors:
 - Tom Duffield