kitchen-docker-api 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## 0.8.0 
+## 0.2.0
+
+* Added support for container_name
+* Pulled in disable_upstart from kitchen-docker
+
+## 0.1.0 
 
 * Initial fork from kitchen-docker
 * Supports docker version < 0.9

data/README.md

@@ -8,7 +8,7 @@ driver which uses the docker CLI you should look at the original
 which this fork originated. 
 
 Substantial credit for this driver goes to Sean Porter for the CLI
-implmentation & his support in developing the docker-api based version.
+implementation & his support in developing the docker-api based version.
 We ultimately decided it would be best to have two versions so folks
 could choose to use the CLI or docker-api based client. 
 
@@ -127,6 +127,31 @@ installed. There are several different behaviors available:
 
 The default value is `true`.
 
+### container\_name
+
+Allows for specification of a container name which will be visible in
+`docker ps`. This makes tracking down containers associated w/ cookbook
+testing easier. 
+
+This defaults to a calculated value which is a combination of 4 attributes:
+
+- platform name
+- CWD basename (where kitchen was run from)
+- suite name
+- hostname of initiating system
+
+For example, a cookbook named `test-gem` has this name when run from my
+laptop on a remote system:
+
+`ubuntu-12.04..test-gem..default..anichols-mbr`
+
+### disable\_upstart
+
+Disables upstart on Debian/Ubuntu containers, as many images do not
+support a working upstart.
+
+The default value is `true`.
+
 ### provision\_command
 
 Custom command(s) to be run when provisioning the base for the suite containers.
@@ -151,10 +176,10 @@ driver_config:
 
 ### remove\_images
 
-This determines if images are automatically removed when the suite container is
-destroyed.
+This determines if intermediate images are removed after container
+creation. Equivalent to `-rm` docker cli option.
 
-The default value is `false`.
+The default value is `true`.
 
 ### run_command
 

data/lib/kitchen/driver/docker.rb

@@ -17,6 +17,7 @@
 require 'kitchen'
 require 'json'
 require 'docker'
+require 'socket'
 
 module Kitchen
 
@@ -27,7 +28,7 @@ module Kitchen
 
       default_config :socket,        'unix:///var/run/docker.sock'
       default_config :privileged,    false
-      default_config :remove_images, false
+      default_config :remove_images, true
       default_config :run_command,   '/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no'
       default_config :username,      'kitchen'
       default_config :password,      'kitchen'
@@ -41,6 +42,12 @@ module Kitchen
         driver.default_platform
       end
 
+      default_config :container_name do |driver|
+        driver.default_container_name
+      end
+
+      default_config :disable_upstart, true
+
       def initialize(*args)
         super(*args)
         @docker_connection = ::Docker::Connection.new(config[:socket], :read_timeout => config[:read_timeout])
@@ -49,9 +56,17 @@ module Kitchen
         end
       end
 
+      def default_container_name
+        platform = instance.platform.name
+        suite = instance.suite.name
+        cookbook = instance.provisioner.instance_variable_get("@config")[:kitchen_root].split('/').last
+        hostname = Socket.gethostname.split('.').first
+        [platform,cookbook,suite,hostname].join('..')
+      end
+
       def default_image
         platform, release = instance.platform.name.split('-')
-        release ? [platform, release].join(':') : 'base'
+        release ? [platform, release].join(':') : platform
       end
 
       def default_platform
@@ -88,13 +103,16 @@ module Kitchen
         from = "FROM #{config[:image]}"
         platform = case config[:platform]
         when 'debian', 'ubuntu'
-          <<-eos
-            ENV DEBIAN_FRONTEND noninteractive
+          disable_upstart = <<-eos
             RUN dpkg-divert --local --rename --add /sbin/initctl
             RUN ln -sf /bin/true /sbin/initctl
+          eos
+          packages = <<-eos
+            ENV DEBIAN_FRONTEND noninteractive
             RUN apt-get update
             RUN apt-get install -y sudo openssh-server curl lsb-release
-          eos
+         eos
+         config[:disable_upstart] ? disable_upstart + packages : packages
         when 'rhel', 'centos'
           <<-eos
             RUN yum clean all
@@ -130,6 +148,8 @@ module Kitchen
           :Privileged => config[:privileged],
           :PublishAllPorts => false
         }
+        # Yes, this key must be a string
+        data['name'] = config[:container_name]
         data[:CpuShares] = config[:cpu] if config[:cpu]
         data[:Dns] = config[:dns] if config[:dns]
         data[:Hostname] = config[:hostname] if config[:hostname]
@@ -163,7 +183,6 @@ module Kitchen
       end
 
       def create_image(state, opts = {})
-        info("Fetching Docker base image '#{config[:image]}' and building...")
         opts[:rm] = config[:remove_images]
         image = ::Docker::Image.build(dockerfile, opts, @docker_connection) do |chunk|
           parse_log_chunk(chunk)

data/lib/kitchen/driver/docker_version.rb

@@ -19,6 +19,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "0.1.0"
+    DOCKER_VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen