chef-provisioning-docker 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64bbb414a5fb8938463923ee377c803551cca0af
-  data.tar.gz: cbd0abd0ee49daceabce24aae225bfe4169bcab4
+  metadata.gz: fc7fa0f834bb6e06862b181f7e5ee731c269b829
+  data.tar.gz: d3e36c65b7d888de6c9d9e9912d6e98c629af9ac
 SHA512:
-  metadata.gz: a51b6596e0b15f8a274da03d1cde0ce2781d27461c9daccdcfb4d5f0b4c43ea5c1c5f2c8d4f2a52c005197d266327b2841f52b3c78746c44e8ea6d66edddfa9b
-  data.tar.gz: e520307871c6db26ea5502292f485a3bd55548c246cbf5c591ef89bbff8e990a145b847cc6c7e4e9da7d58256e7b691e5f517feaf5863f6fe6ddbe7463bed0b0
+  metadata.gz: 402ec362d657c594e500d59285d3079ab260f9cdb776763b5045061605c3f2af3986a829e571f89cc9e4d76b40752df441bce03da8a505a8b061c8d96ea492a3
+  data.tar.gz: 51339e56bf906960d49be71da0acde8c517145c3d9b6b3313d18cc72309b075183f01d279e4ebd9d6e3195ed312776ac760d28195c177bb7a6fb587e814c7f6e

data/README.md

@@ -5,7 +5,7 @@ How to use:
 First you need to ensure that Docker is running. This can be done on a Linux host using Docker's installers or on OSX using boot2docker. Once you have that, you can install the dependencies with Bundler and then use the Docker  like the following:
 
 ```  
-CHEF_=docker bundle exec chef-client -z docker_ubuntu_image.rb
+CHEF_DRIVER=docker bundle exec chef-client -z docker_ubuntu_image.rb
 ```   
 
 This will run Chef-zero and use the description stored in docker_ubuntu_image.rb (the second example below). Note that some configuration syntax is likely to change a little bit so be sure to check the documentation. 
@@ -27,6 +27,13 @@ machine 'wario' do
           :tag => '14.04'
       },
       :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"

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

@@ -11,6 +11,7 @@ module DockerDriver
     #   :ports => a list of port numbers to listen on
     def initialize(machine_spec, transport, convergence_strategy, opts = {})
       super(machine_spec, transport, convergence_strategy)
+      @env = opts[:env]
       @command = opts[:command]
       @ports = opts[:ports]
       @keep_stdin_open = opts[:keep_stdin_open]
@@ -26,7 +27,7 @@ module DockerDriver
       super action_handler
       if @command
         Chef::Log.debug("DockerContainerMachine converge complete, executing #{@command} in #{@container_name}")
-        @transport.execute(@command, :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, :keep_stdin_open => @keep_stdin_open)
       end
     end
 

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

@@ -32,6 +32,7 @@ module DockerDriver
 
     # Execute the specified command inside the container, returns a Mixlib::Shellout object
     # Options contains the optional keys:
+    #   :env => env vars
     #   :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)
@@ -62,6 +63,13 @@ module DockerDriver
 
       args = ['docker', 'run', '--name', container_name]
 
+      if options[:env]      
+	options[:env].each do |key, value| 
+          args << '-e'
+          args << "#{key}=#{value}"
+        end
+      end
+
       if options[:detached]
         args << '--detach'
       end
@@ -115,7 +123,7 @@ module DockerDriver
           tarfile << block
         end
       rescue Docker::Error::ServerError
-        if $!.message =~ /500/
+        if $!.message =~ /500/ || $!.message =~ /Could not find the file/
           return nil
         else
           raise

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

@@ -225,6 +225,7 @@ module DockerDriver
           transport,
           convergence_strategy,
           :command => docker_options[:command],
+          :env => docker_options[:env],
           :ports => [].push(docker_options[:ports]).flatten,
           :keep_stdin_open => docker_options[:keep_stdin_open]
         )

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

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module DockerDriver
-  VERSION = '0.5'
+  VERSION = '0.5.1'
 end
 end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-docker
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   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: chef-provisioning
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: docker-api
   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
     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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Provisioner for creating Docker containers in Chef Provisioning.
@@ -121,12 +121,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -136,4 +136,3 @@ signing_key:
 specification_version: 4
 summary: Provisioner for creating Docker containers in Chef Provisioning.
 test_files: []
-has_rdoc: