chef-metal-docker 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f887c370b4d9532f2b54d32bf4f83ba3007185
-  data.tar.gz: 27e57e757b0a975d2e2878dcc621d62bdd0b8339
+  metadata.gz: 4b983e22ca453eba535c0495dcb470afa90542ac
+  data.tar.gz: ee1a76530f5ca78bc6c658d652870e28eacf0e6b
 SHA512:
-  metadata.gz: cab7c6159f5d8e0a18084c0e99481d2047bc534b0f992e64fbc22e01c36867891528fac32322aa753b8f4da855511e8c359c8bbb416cc0a4d5cbe2de31b5c6cc
-  data.tar.gz: 718f8274204319a35cbd98c6db40ecb72e22262bbde99d4fd797618421ff2cae9e62c9dadca50c0b5ccdde9a24fbe77e2c80cbb94f53542a6d31474c921520fc
+  metadata.gz: d69ce866e7dbc2ce028e08a54f285d775bef06a37fd1ead888437bd2bdc880a9648eca262357b2000e4fb98639558848e05d08c38a21f15b1c009ab3214a784d
+  data.tar.gz: ddaf05a36de3aa025b439ff32fda70d2e34ee1edccf6bb6ef1eddadc477071175cb907420bc77b651774ca407c650118b90fa8eba7ac74b1eaff0896dd06effe

data/README.md

@@ -18,7 +18,7 @@ Using this driver, you can then define a machine similar to the following exampl
 require 'chef_metal_docker'
 
 machine 'wario' do
-    recipe 'apache'
+    recipe 'openssh::default'
     
     machine_options :docker_options => {
       :base_image => {
@@ -26,7 +26,22 @@ machine 'wario' do
           :repository => 'ubuntu',
           :tag => '14.04'
       },
-      :command => '/usr/sbin/httpd'
+      :command => '/usr/sbin/sshd -p 8022 -D',      
+      
+      # 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"] 
+
+      # Examples (single):
+      :ports => 1234
+      :ports => "2345:6789"
+
+      # if you need to keep stdin open (i.e docker run -i)
+      # :keep_stdin_open => true
+
     }
 end
 ```

data/lib/chef_metal_docker/docker_container_machine.rb

@@ -3,9 +3,15 @@ require 'chef_metal/machine/unix_machine'
 module ChefMetalDocker
   class DockerContainerMachine < ChefMetal::Machine::UnixMachine
 
-    def initialize(machine_spec, transport, convergence_strategy, command)
+    # Expects a machine specification, a usable transport and convergence strategy
+    # Options is expected to contain the optional keys
+    #   :command => the final command to execute
+    #   :ports => a list of port numbers to listen on
+    def initialize(machine_spec, transport, convergence_strategy, opts = {})
       super(machine_spec, transport, convergence_strategy)
-      @command = command
+      @command = opts[:command]
+      @ports = opts[:ports]
+      @keep_stdin_open = opts[:keep_stdin_open]
       @container_name = machine_spec.location['container_name']
       @transport = transport
     end
@@ -18,7 +24,7 @@ module ChefMetalDocker
       super action_handler
       if @command
         Chef::Log.debug("DockerContainerMachine converge complete, executing #{@command} in #{@container_name}")
-        @transport.execute(@command, :detached => true, :read_only => true)
+        @transport.execute(@command, :detached => true, :read_only => true, :ports => @ports, :keep_stdin_open => @keep_stdin_open)
       end
     end
 

data/lib/chef_metal_docker/docker_driver.rb

@@ -223,7 +223,9 @@ module ChefMetalDocker
           machine_spec,
           transport,
           convergence_strategy,
-          docker_options[:command]
+          :command => docker_options[:command],
+          :ports => [].push(docker_options[:ports]).flatten,
+          :keep_stdin_open => docker_options[:keep_stdin_open]
         )
     end
 

data/lib/chef_metal_docker/docker_transport.rb

@@ -4,7 +4,6 @@ require 'archive/tar/minitar'
 require 'shellwords'
 require 'uri'
 require 'socket'
-require 'em-proxy'
 require 'mixlib/shellout'
 require 'sys/proctable'
 require 'chef_metal_docker/chef_zero_http_proxy'
@@ -29,6 +28,11 @@ module ChefMetalDocker
     attr_reader :connection
     attr_reader :tunnel_transport
 
+    # Execute the specified command inside the container, returns a Mixlib::Shellout object
+    # Options contains the optional keys:
+    #   :read_only => Do not commit this execute operation, just execute it
+    #   :ports => ports to listen on (-p command-line options)
+    #   :detached => true/false, execute this command in detached mode (for final program to run)
     def execute(command, options={})
       Chef::Log.debug("execute '#{command}' with options #{options}")
 
@@ -39,6 +43,7 @@ module ChefMetalDocker
         Chef::Log.debug("Already stopped #{container_name}")
       rescue Docker::Error::NotFoundError
       end
+
       begin
         # Delete the container if it exists and is dormant
         connection.delete("/containers/#{container_name}?v=true&force=true")
@@ -54,19 +59,37 @@ module ChefMetalDocker
       live_stream = options[:stream_stdout] if options[:stream_stdout]
 
       args = ['docker', 'run', '--name', container_name]
-      if options[:detached] 
+
+      if options[:detached]
         args << '--detach'
       end
+
+      if options[:ports]
+        options[:ports].each do |portnum|
+          args << '-p'
+          args << "#{portnum}"
+        end
+      end
+
+      if options[:keep_stdin_open]
+        args << '-i'
+      end
+
       args << @image.id
       args += command
-      cmdstr = Shellwords.join(args) 
+
+      cmdstr = Shellwords.join(args)
       Chef::Log.debug("Executing #{cmdstr}")
 
+      # Remove this when https://github.com/opscode/chef/pull/2100 gets merged and released
+      # nullify live_stream because at the moment EventsOutputStream doesn't understand <<, which
+      # ShellOut uses
+      live_stream = nil unless live_stream.respond_to? :<<
+
       cmd = Mixlib::ShellOut.new(cmdstr, :live_stream => live_stream, :timeout => execute_timeout(options))
 
       cmd.run_command
 
-
       unless options[:read_only]
         Chef::Log.debug("Committing #{container_name} as #{repository_name}:#{container_name}")
         container = Docker::Container.get(container_name)
@@ -74,6 +97,7 @@ module ChefMetalDocker
       end
 
       Chef::Log.debug("Execute complete: status #{cmd.exitstatus}")
+
       cmd
     end
 
@@ -212,10 +236,6 @@ module ChefMetalDocker
       )
     end
 
-    def wait_for_attach(excon, datum)
-      Excon::Response.new(excon.send(:response, datum)[:response])
-    end
-
     # Method that takes chunks and calls the attached block for each mux'd message
     def attach_for(block, msg_stack)
       messages = Docker::Messages.new

data/lib/chef_metal_docker/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalDocker
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-docker
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: em-proxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
@@ -116,16 +102,16 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- Rakefile
 - LICENSE
 - README.md
+- Rakefile
 - lib/chef_metal/driver_init/docker.rb
+- lib/chef_metal_docker.rb
 - lib/chef_metal_docker/chef_zero_http_proxy.rb
 - lib/chef_metal_docker/docker_container_machine.rb
 - lib/chef_metal_docker/docker_driver.rb
 - lib/chef_metal_docker/docker_transport.rb
 - lib/chef_metal_docker/version.rb
-- lib/chef_metal_docker.rb
 homepage: https://github.com/opscode/chef-metal-docker
 licenses: []
 metadata: {}
@@ -145,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provisioner for creating Docker containers in Chef Metal.