chef-metal-docker 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423d34630e6382c7d8d9ad91597e5d34e5b7191b
-  data.tar.gz: 702af2043c4db494e3b67ed8c38bf9c94de24d45
+  metadata.gz: a9f887c370b4d9532f2b54d32bf4f83ba3007185
+  data.tar.gz: 27e57e757b0a975d2e2878dcc621d62bdd0b8339
 SHA512:
-  metadata.gz: 149d95a39c819994ecf0cbbd7d2784f4a4b224d174d96c7a1860095340e8e554793d1de341ab5acc5be496fe41324bc79022f1b6e6ac71c2ece5c228818668b2
-  data.tar.gz: 7f4a173fde92f6a011aac0d221c2499ffeb382109d330b5e205236358a6222a1ba329eabda08d91b14a64acf6e15ddfcef9d0553ca04770624cb331b2cbdc799
+  metadata.gz: cab7c6159f5d8e0a18084c0e99481d2047bc534b0f992e64fbc22e01c36867891528fac32322aa753b8f4da855511e8c359c8bbb416cc0a4d5cbe2de31b5c6cc
+  data.tar.gz: 718f8274204319a35cbd98c6db40ecb72e22262bbde99d4fd797618421ff2cae9e62c9dadca50c0b5ccdde9a24fbe77e2c80cbb94f53542a6d31474c921520fc

data/lib/chef_metal_docker.rb

@@ -1,4 +1,2 @@
 require 'chef_metal'
 require 'chef_metal_docker/docker_driver'
-require 'chef/resource/docker_container'
-require 'chef/provider/docker_container'

data/lib/chef_metal_docker/docker_container_machine.rb

@@ -18,7 +18,7 @@ module ChefMetalDocker
       super action_handler
       if @command
         Chef::Log.debug("DockerContainerMachine converge complete, executing #{@command} in #{@container_name}")
-        @transport.execute(@command)
+        @transport.execute(@command, :detached => true, :read_only => true)
       end
     end
 

data/lib/chef_metal_docker/docker_transport.rb

@@ -52,10 +52,18 @@ module ChefMetalDocker
       live_stream = nil
       live_stream = STDOUT if options[:stream]
       live_stream = options[:stream_stdout] if options[:stream_stdout]
-      cmd = Mixlib::ShellOut.new(Shellwords.join(['docker', 'run', '--name', container_name, @image.id ] + command),
-        :live_stream => live_stream, :timeout => execute_timeout(options))
 
-      Chef::Log.debug("Executing #{cmd}")
+      args = ['docker', 'run', '--name', container_name]
+      if options[:detached] 
+        args << '--detach'
+      end
+      args << @image.id
+      args += command
+      cmdstr = Shellwords.join(args) 
+      Chef::Log.debug("Executing #{cmdstr}")
+
+      cmd = Mixlib::ShellOut.new(cmdstr, :live_stream => live_stream, :timeout => execute_timeout(options))
+
       cmd.run_command
 
 

data/lib/chef_metal_docker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-docker
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -116,18 +116,16 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- Rakefile
 - LICENSE
 - README.md
-- Rakefile
-- lib/chef/provider/docker_container.rb
-- lib/chef/resource/docker_container.rb
 - 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: {}
@@ -147,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Provisioner for creating Docker containers in Chef Metal.

data/lib/chef/provider/docker_container.rb

@@ -1,21 +0,0 @@
-require 'chef/provider/lwrp_base'
-
-class Chef::Provider::DockerContainer < Chef::Provider::LWRPBase
-
-  def whyrun_supported?
-    true
-  end
-
-  def load_current_resource
-    # Don't do this here...
-  end
-
-  action :create do
-
-  end
-
-  action :delete do
-
-  end
-
-end

data/lib/chef/resource/docker_container.rb

@@ -1,52 +0,0 @@
-require 'chef/resource/lwrp_base'
-
-class Chef::Resource::DockerContainer < Chef::Resource::Machine
-
-  attribute :image, :name_attribute => true
-  attribute :attach, :kind_of => [TrueClass, FalseClass]
-  attribute :author, :kind_of => [String]
-  attribute :cidfile, :kind_of => [String]
-  attribute :cmd_timeout, :kind_of => [Integer], :default => 60
-  attribute :command, :kind_of => [String]
-  attribute :container_name, :kind_of => [String]
-  attribute :cookbook, :kind_of => [String], :default => 'docker'
-  attribute :created, :kind_of => [String]
-  attribute :cpu_shares, :kind_of => [Fixnum]
-  attribute :destination, :kind_of => [String]
-  attribute :detach, :kind_of => [TrueClass, FalseClass]
-  attribute :dns, :kind_of => [String, Array], :default => nil
-  attribute :dns_search, :kind_of => [String, Array], :default => nil
-  attribute :entrypoint, :kind_of => [String]
-  attribute :env, :kind_of => [String, Array]
-  attribute :expose, :kind_of => [Fixnum, String, Array]
-  attribute :force, :kind_of => [TrueClass, FalseClass], :default => false
-  attribute :hostname, :kind_of => [String]
-  attribute :id, :kind_of => [String]
-  attribute :init_type, :kind_of => [FalseClass, String], :default => nil
-  attribute :init_template, :kind_of => [String]
-  attribute :link, :kind_of => [String, Array]
-  attribute :label, :kind_of => [String]
-  attribute :lxc_conf, :kind_of => [String, Array]
-  attribute :memory, :kind_of => [Fixnum]
-  attribute :message, :kind_of => [String]
-  attribute :networking, :kind_of => [TrueClass, FalseClass]
-  attribute :opt, :kind_of => [String, Array]
-  attribute :port, :kind_of => [Fixnum, String, Array]
-  attribute :privileged, :kind_of => [TrueClass, FalseClass]
-  attribute :publish_exposed_ports, :kind_of => [TrueClass, FalseClass], :default => false
-  attribute :public_port, :kind_of => [Fixnum]
-  attribute :remove_automatically, :kind_of => [TrueClass, FalseClass], :default => false
-  attribute :repository, :kind_of => [String]
-  attribute :run, :kind_of => [String]
-  attribute :socket_template, :kind_of => [String]
-  attribute :source, :kind_of => [String]
-  attribute :status, :kind_of => [String]
-  attribute :stdin, :kind_of => [TrueClass, FalseClass]
-  attribute :tag, :kind_of => [String]
-  attribute :tty, :kind_of => [TrueClass, FalseClass]
-  attribute :user, :kind_of => [String]
-  attribute :volume, :kind_of => [String, Array]
-  attribute :volumes_from, :kind_of => [String]
-  attribute :working_directory, :kind_of => [String]
-
-end