chef-provisioning-docker 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ec4b5e583d16fa9f00cc14e0504dd3d9e8d392f
-  data.tar.gz: 2af59e90c819b9f9cb2a3a57f82be6c9cd64e299
+  metadata.gz: 0e6789da274574121591c374a64e0d9da7b53092
+  data.tar.gz: eaf4c266978efe1a32247ce4a21f25daf77e1a6d
 SHA512:
-  metadata.gz: 7f0f8a74d6b873cf3e69147dba79ebe8d6c112f53d3cde7b20dbff8511672b259ccea10dece62cedcb41da24c33fe6b0ff37481f810269bf48acd714865d2cbe
-  data.tar.gz: 36a5c76b1528709222cf23305f0a289db028e82304a2ee538f12ef1a19380d97f6fc56a0733803e9748cccd09637363bd34a6a2dc7aa51b1730fb1967e60933e
+  metadata.gz: 0ae43fca9bbb00973288ae92d1386802fc97403ce5e8f85dd5002e421f01026a9509247232a345810e94bdb64e40aa0cd28628dee71eea00e93e1a5f2f73a133
+  data.tar.gz: 2e4533eee5d21ab3c049be12494c279333906fc9c6364de16d965174c22b3f71f0295f5be0aa9ed027324ca2f944770ee1d3d69bbf346075b6a4173d4ef6e135

data/README.md

@@ -4,11 +4,11 @@ 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_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. 
+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.
 
 ## Machine creation
 
@@ -65,10 +65,6 @@ machine 'wario' do
 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
-as the container's run command. 
-
 ## Machine images
 
 This  supports the new machine image paradigm; with Docker you can build a base image, save that and use it to create a new container. Here is an example of this:
@@ -96,3 +92,8 @@ machine 'web00' do
   }
 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
+as the container's run command.
+

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

@@ -63,8 +63,8 @@ module DockerDriver
 
       args = ['docker', 'run', '--name', container_name]
 
-      if options[:env]      
-	options[:env].each do |key, value| 
+      if options[:env]
+        options[:env].each do |key, value|
           args << '-e'
           args << "#{key}=#{value}"
         end
@@ -179,11 +179,12 @@ module DockerDriver
     def make_url_available_to_remote(url)
       # The host is already open to the container.  Just find out its address and return it!
       uri = URI(url)
+      uri.scheme = 'http' if 'chefzero' == uri.scheme && uri.host == 'localhost'
       host = Socket.getaddrinfo(uri.host, uri.scheme, nil, :STREAM)[0][3]
       Chef::Log.debug("Making URL available: #{host}")
 
       if host == '127.0.0.1' || host == '::1'
-        result = execute('ip route ls', :read_only => true)
+        result = execute('ip route list', :read_only => true)
 
         Chef::Log.debug("IP route: #{result.stdout}")
 

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

@@ -5,6 +5,7 @@ require 'chef/provisioning/docker_driver/docker_transport'
 require 'chef/provisioning/docker_driver/docker_container_machine'
 require 'chef/provisioning/convergence_strategy/install_cached'
 require 'chef/provisioning/convergence_strategy/no_converge'
+require 'chef/mash'
 
 require 'yaml'
 require 'docker/container'
@@ -73,13 +74,14 @@ module DockerDriver
     def allocate_machine(action_handler, machine_spec, machine_options)
 
       container_name = machine_spec.name
-      machine_spec.location = {
+      machine_spec.reference = {
           'driver_url' => driver_url,
           'driver_version' => Chef::Provisioning::DockerDriver::VERSION,
           'allocated_at' => Time.now.utc.to_s,
           'host_node' => action_handler.host_node,
           'container_name' => container_name,
-          'image_id' => machine_options[:image_id]
+          'image_id' => machine_options[:image_id],
+          'docker_options' => machine_options[:docker_options]
       }
     end
 
@@ -90,10 +92,13 @@ module DockerDriver
     end
 
     def build_container(machine_spec, machine_options)
-
       docker_options = machine_options[:docker_options]
 
       base_image = docker_options[:base_image]
+      if !base_image
+        Chef::Log.debug("No base images specified in docker options.")
+        base_image = base_image_for(machine_spec)
+      end
       source_name = base_image[:name]
       source_repository = base_image[:repository]
       source_tag = base_image[:tag]
@@ -105,7 +110,8 @@ module DockerDriver
         target_repository = 'chef'
         target_tag = machine_spec.name
 
-        image = find_image(target_repository, target_tag)
+        # check if target image exists, if not try to look up for source image.
+        image = find_image(target_repository, target_tag) || find_image(source_repository, source_tag)
 
         # kick off image creation
         if image == nil
@@ -116,15 +122,22 @@ module DockerDriver
           Chef::Log.debug("Allocated #{image}")
           image.tag('repo' => 'chef', 'tag' => target_tag)
           Chef::Log.debug("Tagged image #{image}")
+        elsif not image.info['RepoTags'].include? "#{target_repository}:#{target_tag}"
+          # if `find_image(source_repository, source_tag)` returned result, assign target tag to it to be able
+          # find it in `start_machine`.
+          image.tag('repo' => target_repository, 'tag' => target_tag)
         end
 
         "#{target_repository}:#{target_tag}"
       end
     end
 
-    def allocate_image(action_handler, image_spec, image_options, machine_spec)
+    def allocate_image(action_handler, image_spec, image_options, machine_spec, machine_options)
       # Set machine options on the image to match our newly created image
-      image_spec.machine_options = {
+      image_spec.reference = {
+        'driver_url' => driver_url,
+        'driver_version' => Chef::Provisioning::DockerDriver::VERSION,
+        'allocated_at' => Time.now.to_i,
         :docker_options => {
           :base_image => {
             :name => "chef_#{image_spec.name}",
@@ -134,12 +147,20 @@ module DockerDriver
           :from_image => true
         }
       }
+      # Workaround for chef/chef-provisioning-docker#37
+      machine_spec.attrs[:keep_image] = true
     end
 
     def ready_image(action_handler, image_spec, image_options)
       Chef::Log.debug('READY IMAGE!')
     end
 
+    # workaround for https://github.com/chef/chef-provisioning/issues/358.
+    def destroy_image(action_handler, image_spec, image_options, machine_options={})
+      image = Docker::Image.get("chef:#{image_spec.name}")
+      image.delete unless image.nil?
+    end
+
     # Connect to machine without acquiring it
     def connect_to_machine(machine_spec, machine_options)
       Chef::Log.debug('Connect to machine!')
@@ -161,10 +182,11 @@ module DockerDriver
       Chef::Log.debug("Removing #{container_name}")
       container.delete
 
-      Chef::Log.debug("Destroying image: chef:#{container_name}")
-      image = Docker::Image.get("chef:#{container_name}")
-      image.delete
-
+      if !machine_spec.attrs[:keep_image] && !machine_options[:keep_image]
+        Chef::Log.debug("Destroying image: chef:#{container_name}")
+        image = Docker::Image.get("chef:#{container_name}")
+        image.delete
+      end
     end
 
     def stop_machine(action_handler, node)
@@ -226,8 +248,8 @@ module DockerDriver
           convergence_strategy,
           :command => docker_options[:command],
           :env => docker_options[:env],
-          :ports => [].push(docker_options[:ports]).flatten,
-          :volumes => [].push(docker_options[:volumes]).flatten.compact,
+          :ports => Array(docker_options[:ports]),
+          :volumes => Array(docker_options[:volumes]),
           :keep_stdin_open => docker_options[:keep_stdin_open]
         )
     end
@@ -239,6 +261,11 @@ module DockerDriver
       end
     end
 
+    def base_image_for(machine_spec)
+      Chef::Log.debug("Looking for image #{machine_spec.from_image}")
+      image_spec = machine_spec.managed_entry_store.get!(:machine_image, machine_spec.from_image)
+      Mash.new(image_spec.reference)[:docker_options][:base_image]
+    end
   end
 end
 end

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

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

data/spec/docker_support.rb

@@ -0,0 +1,31 @@
+module DockerSupport
+  require 'cheffish/rspec/chef_run_support'
+  def self.extended(other)
+    other.extend Cheffish::RSpec::ChefRunSupport
+  end
+
+  require 'chef/provisioning/docker_driver'
+
+  def with_docker(description, *tags, &block)
+    context_block = proc do
+      docker_driver = Chef::Provisioning.driver_for_url("docker")
+
+      @@driver = docker_driver
+      def self.driver
+        @@driver
+      end
+
+      module_eval(&block)
+    end
+
+    when_the_repository "exists and #{description}", *tags, &context_block
+  end
+end
+
+module DockerConfig
+  def chef_config
+    @chef_config ||= {
+      driver:       Chef::Provisioning.driver_for_url("docker"),
+    }
+  end
+end

data/spec/integration/primitives_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'time'
+
+describe "chef-provisioning-docker" do
+  extend DockerSupport
+  include DockerConfig
+
+  when_the_chef_12_server "exists", organization: "foo", server_scope: :context, port: 8900..9000 do
+    with_docker "integration tests" do
+
+      # owing to how RSpec works, things defined by let() are not accessible in the recipes we define inside
+      # expect_converge{}.
+      ubuntu_options = {
+          :base_image => {
+            :name => 'ubuntu',
+            :repository => 'ubuntu',
+            :tag => '14.04'
+          },
+        }
+
+      let(:iso_date) { Time.now.iso8601.gsub(':', '') }
+      docker_driver = driver
+
+      context "machine_image resource" do
+
+        let(:spec_image_tag) { "docker_image_spec_#{iso_date}" }
+
+        after(:each) {
+          image = docker_driver.find_image("chef", spec_image_tag)
+          image.delete(force: true) unless image.nil?
+        }
+
+        it ":create succeeds" do
+          tag = spec_image_tag
+
+          expect_converge {
+
+            machine_image tag do
+              machine_options :docker_options => ubuntu_options
+              action :create
+            end
+          }.not_to raise_error
+
+          expect(docker_driver.find_image("chef", tag)).not_to be_nil
+        end
+
+        it ":destroy succeeds with an existing image" do
+          tag = spec_image_tag
+
+          expect_converge {
+            machine_image tag do
+              machine_options :docker_options => ubuntu_options
+              action :create
+            end
+
+            machine_image tag do
+              action :destroy
+            end
+          }.not_to raise_error
+
+          expect(docker_driver.find_image("chef", tag)).to be_nil
+        end
+
+        it ":destroy succeeds with a non-existent image" do
+          tag = "bogus_image"
+          expect_converge {
+            machine_image tag do
+              action :destroy
+            end
+          }.not_to raise_error
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,32 @@
+# require "mixlib/shellout"
+require 'chef'
+require 'chef/mixins'
+require 'chef/dsl'
+require 'chef/application'
+require 'chef/applications'
+
+require 'chef/shell'
+require 'chef/util/file_edit'
+
+require 'chef/config'
+require 'docker_support'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-docker
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Tom Duffield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitar
+  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
@@ -112,6 +126,9 @@ files:
 - lib/chef/provisioning/docker_driver/driver.rb
 - lib/chef/provisioning/docker_driver/version.rb
 - lib/chef/provisioning/driver_init/docker.rb
+- spec/docker_support.rb
+- spec/integration/primitives_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/opscode/chef-provisioning-docker
 licenses: []
 metadata: {}
@@ -131,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Provisioner for creating Docker containers in Chef Provisioning.