chef-provisioning-docker 0.5.2 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 959604e2862aa490b2f63f3f326adc682c068a18
-  data.tar.gz: c9ff236c685873fa302eab7d1be1982cfd5740dd
+  metadata.gz: 2ec4b5e583d16fa9f00cc14e0504dd3d9e8d392f
+  data.tar.gz: 2af59e90c819b9f9cb2a3a57f82be6c9cd64e299
 SHA512:
-  metadata.gz: f39e023ac212535111eead676a7f4fc2799c13cc833bba6b9aefbe2fed4d038780c2334ff6a644b3291d8e41c5e7843ed72f15b45bcb00a4d22a29596d626092
-  data.tar.gz: eaae6f3291c3799d95a6f473f332cb66b2ba1dab10e998195822812b44f8a0d0bc730df1b4bc83a28809b58071db534ccd19678761131833b6c16bdf572c0a96
+  metadata.gz: 7f0f8a74d6b873cf3e69147dba79ebe8d6c112f53d3cde7b20dbff8511672b259ccea10dece62cedcb41da24c33fe6b0ff37481f810269bf48acd714865d2cbe
+  data.tar.gz: 36a5c76b1528709222cf23305f0a289db028e82304a2ee538f12ef1a19380d97f6fc56a0733803e9748cccd09637363bd34a6a2dc7aa51b1730fb1967e60933e

data/README.md

@@ -14,37 +14,49 @@ This will run Chef-zero and use the description stored in docker_ubuntu_image.rb
 
 Using this , you can then define a machine similar to the following example:
 
-```ruby   
+```ruby
 require 'chef/provisioning/docker_driver'
 
 machine 'wario' do
     recipe 'openssh::default'
-    
+
     machine_options :docker_options => {
       :base_image => {
           :name => 'ubuntu',
           :repository => 'ubuntu',
           :tag => '14.04'
       },
-      :command => '/usr/sbin/sshd -p 8022 -D',      
+      :command => '/usr/sbin/sshd -p 8022 -D',
 
       #ENV (Environment Variables)
       #Set any env var in the container by using one or more -e flags, even overriding those already defined by the developer with a Dockerfile ENV
       :env => {
          "deep" => 'purple',
          "led" => 'zeppelin'
-      }
-      
+      },
+
       # Ports can be one of two forms:
       # src_port (string or integer) is a pass-through, i.e 8022 or "9933"
       # src:dst (string) is a map from src to dst, i.e "8022:8023" maps 8022 externally to 8023 in the container
 
       # Example (multiple):
-      :ports => [8022, "8023:9000", "9500"] 
+      :ports => [8022, "8023:9000", "9500"],
 
       # Examples (single):
-      :ports => 1234
-      :ports => "2345:6789"
+      :ports => 1234,
+      :ports => "2345:6789",
+
+      # Volumes can be one of three forms:
+      # src_volume (string) is volume to add to container, i.e. creates new volume inside container at "/tmp"
+      # src:dst (string) mounts host's directory src to container's dst, i.e "/tmp:/tmp1" mounts host's directory /tmp to container's /tmp1
+      # src:dst:mode (string) mounts host's directory src to container's dst with the specified mount option, i.e "/:/rootfs:ro" mounts read-only host's root (/) folder to container's /rootfs
+      # See more details on Docker volumes at https://github.com/docker/docker/blob/master/docs/sources/userguide/dockervolumes.md .
+
+      # Example (single):
+      :volumes => "/tmp",
+
+      # Example (multiple):
+      :volumes => ["/tmp:/tmp", "/:/rootfs:ro"],
 
       # if you need to keep stdin open (i.e docker run -i)
       # :keep_stdin_open => true

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

@@ -16,77 +16,80 @@ class ChefZeroHttpProxy
 
       # Start our server to handle connections (will raise things on errors)
       @socket = TCPServer.new @local_address, @local_port
-      
+
       # Handle every request in another thread
       loop do
         s = @socket.accept
         Thread.new s, &method(:handle_request)
       end
-      
+
     ensure
       @socket.close if @socket
     end
   end
-  
+
   def handle_request(to_client)
-    request_line = to_client.readline
+    begin
+      request_line = to_client.readline
 
-    verb = request_line[/^\w+/]
-    url = request_line[/^\w+\s+(\S+)/, 1]
-    version = request_line[/HTTP\/(1\.\d)\s*$/, 1]
-    uri = URI::parse url
+      verb = request_line[/^\w+/]
+      url = request_line[/^\w+\s+(\S+)/, 1]
+      version = request_line[/HTTP\/(1\.\d)\s*$/, 1]
+      uri = URI::parse url
 
-    # Show what got requested
-    Chef::Log.debug("[C->S]: #{verb} ->  #{url}")
+      # Show what got requested
+      Chef::Log.debug("[C->S]: #{verb} ->  #{url}")
 
-    querystr = if uri.query
-                 "#{uri.path}?#{uri.query}"
-               else
-                 uri.path
-               end
+      querystr = if uri.query
+                   "#{uri.path}?#{uri.query}"
+                 else
+                   uri.path
+                 end
 
-    to_server = TCPSocket.new(@remote_address, @remote_port)
+      to_server = TCPSocket.new(@remote_address, @remote_port)
 
-    to_server.write("#{verb} #{querystr} HTTP/#{version}\r\n")
+      to_server.write("#{verb} #{querystr} HTTP/#{version}\r\n")
 
-    content_len = 0
+      content_len = 0
 
-    loop do
-      line = to_client.readline
+      loop do
+        line = to_client.readline
 
-      if line =~ /^Content-Length:\s+(\d+)\s*$/
-        content_len = $1.to_i
-      end
+        if line =~ /^Content-Length:\s+(\d+)\s*$/
+          content_len = $1.to_i
+        end
 
-      # Strip proxy headers
-      if line =~ /^proxy/i
-        next
-      elsif line.strip.empty?
-        to_server.write("Connection: close\r\n\r\n")
+        # Strip proxy headers
+        if line =~ /^proxy/i
+          next
+        elsif line.strip.empty?
+          to_server.write("Connection: close\r\n\r\n")
 
-        if content_len >= 0
-          to_server.write(to_client.read(content_len))
-          Chef::Log.debug("[C->S]: Wrote #{content_len} bytes")
+          if content_len >= 0
+            to_server.write(to_client.read(content_len))
+            Chef::Log.debug("[C->S]: Wrote #{content_len} bytes")
+          end
+
+          break
+        else
+          to_server.write(line)
         end
+      end
 
-        break
-      else
-        to_server.write(line)
+      buff = ''
+      while to_server.read(8192, buff)
+        to_client.write(buff)
       end
-    end
 
-    buff = ''
-    loop do
-      to_server.read(8192, buff)
-      to_client.write(buff)
-      break if buff.size < 8192
-    end
+    rescue
+      Chef::Log.error $!
+      raise
 
-    # Close the sockets
-    to_client.close
-    to_server.close
+    ensure
+      # Close the sockets
+      to_client.close
+      to_server.close
+    end
   end
-  
+
 end
- 
- 

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

@@ -14,6 +14,7 @@ module DockerDriver
       @env = opts[:env]
       @command = opts[:command]
       @ports = opts[:ports]
+      @volumes = opts[:volumes]
       @keep_stdin_open = opts[:keep_stdin_open]
       @container_name = machine_spec.location['container_name']
       @transport = transport
@@ -27,7 +28,7 @@ module DockerDriver
       super action_handler
       if @command
         Chef::Log.debug("DockerContainerMachine converge complete, executing #{@command} in #{@container_name}")
-        @transport.execute(@command, :env => @env ,:detached => true, :read_only => true, :ports => @ports, :keep_stdin_open => @keep_stdin_open)
+        @transport.execute(@command, :env => @env ,:detached => true, :read_only => true, :ports => @ports, :volumes => @volumes, :keep_stdin_open => @keep_stdin_open)
       end
     end
 

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

@@ -81,6 +81,13 @@ module DockerDriver
         end
       end
 
+      if options[:volumes]
+        options[:volumes].each do |volume|
+          args << '-v'
+          args << "#{volume}"
+        end
+      end
+
       if options[:keep_stdin_open]
         args << '-i'
       end

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

@@ -227,6 +227,7 @@ module DockerDriver
           :command => docker_options[:command],
           :env => docker_options[:env],
           :ports => [].push(docker_options[:ports]).flatten,
+          :volumes => [].push(docker_options[:volumes]).flatten.compact,
           :keep_stdin_open => docker_options[:keep_stdin_open]
         )
     end

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

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module DockerDriver
-  VERSION = '0.5.2'
+  VERSION = '0.6'
 end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-docker
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: '0.6'
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provisioner for creating Docker containers in Chef Provisioning.