kitchen-docker 0.13.0 → 1.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07341b12bc0ed0d069e67f378062ebadbbb9bd59
-  data.tar.gz: 56f8a5f831a05a4c9c0ca1418298be82fc0b8c20
+  metadata.gz: 9c5f40664c9323956c6a379f32ad480297fba14b
+  data.tar.gz: 1ffab2d47fca65dc72e45b12335cfba8a2160d18
 SHA512:
-  metadata.gz: f1cf650a4663032c0e04cdd0a3e71154d00740f207704d3b817955d8b42ef3b1b59161140672e070c6e648fc0212c7b0222288b026406b8aea2edcfcaccf1c1a
-  data.tar.gz: dcbc9a8a5191d14bf3497ea6dd3e9b604a3db9ba5d7ef5da4e5a7fc7f2fd2f942e343ca1b549d4828e27bf35a41acc14ee5539fa16415bc7f4834bd45ee49185
+  metadata.gz: 59fd249b44942cbe78c3ca78d88c51cdb08fa75dd70dd3a61c993672aa745736a7d2a40f14c895b3267025020fd577765fc4e785a61d913b3d0d229a3d1cc45b
+  data.tar.gz: f9dd3d4d44eb53c1252153020f847174df0160dc84339f6bbfeb03f0b93f32aaffd4562e1a3a97034b11c8c576a59e3fd0acf49a01ba083fb4fb608d0b0ab14a

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.kitchen/
+.kitchen.local.yml

data/.kitchen.yml

@@ -0,0 +1,14 @@
+---
+driver:
+  name: docker
+
+provisioner:
+  name: dummy
+
+platforms:
+  - name: ubuntu-12.04
+  - name: centos-6.4
+  - name: unknown
+
+suites:
+  - name: default

data/README.md

@@ -6,13 +6,9 @@ A Test Kitchen Driver for Docker.
 
 * [Docker][docker_getting_started]
 
-## Known Issues
-
-* Upstart is neutered due to [this issue][docker_upstart_issue].
-
 ## Installation and Setup
 
-Please read the [Driver usage][driver_usage] page for more details.
+Please read the Test Kitchen [docs][test_kitchen_docs] for more details.
 
 Example `.kitchen.local.yml`:
 
@@ -26,8 +22,8 @@ platforms:
   - recipe[apt]
 - name: centos
   driver_config:
-    image: "centos"
-    platform: "rhel"
+    image: centos
+    platform: rhel
   run_list:
   - recipe[yum]
 ```
@@ -117,6 +113,13 @@ installed. There are several different behaviors available:
 
 The default value is `true`.
 
+### 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.
@@ -124,18 +127,18 @@ Custom command(s) to be run when provisioning the base for the suite containers.
 Examples:
 
 ```
-  provision_command: "curl -L https://www.opscode.com/chef/install.sh | bash"
+  provision_command: curl -L https://www.opscode.com/chef/install.sh | bash
 ```
 
 ```
   provision_command:
-    - "apt-get install dnsutils"
-    - "apt-get install telnet"
+    - apt-get install dnsutils
+    - apt-get install telnet
 ```
 
 ```
 driver_config:
-  provision_command: "curl -L https://www.opscode.com/chef/install.sh | bash"
+  provision_command: curl -L https://www.opscode.com/chef/install.sh | bash
   require_chef_omnibus: false
 ```
 
@@ -146,6 +149,18 @@ destroyed.
 
 The default value is `false`.
 
+### run_command
+
+Sets the command used to run the suite container.
+
+The default value is `/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no`.
+
+Examples:
+
+```
+  run_command: /sbin/init
+```
+
 ### memory
 
 Sets the memory limit for the suite container in bytes. Otherwise use Dockers
@@ -261,7 +276,7 @@ Apache 2.0 (see [LICENSE][license])
 [docker_upstart_issue]:   https://github.com/dotcloud/docker/issues/223
 [docker_index]:           https://index.docker.io/
 [docker_default_image]:   https://index.docker.io/_/base/
-[driver_usage]:           http://docs.kitchen-ci.org/drivers/usage
+[test_kitchen_docs]:      http://kitchen.ci/docs/getting-started/
 [chef_omnibus_dl]:        http://www.opscode.com/chef/install/
 [cpu_shares]:             https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-cpu.html
 [memory_limit]:           https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-memory.html

data/Rakefile

@@ -19,3 +19,10 @@ desc "Run all quality tasks"
 task :quality => [:cane, :tailor, :stats]
 
 task :default => [:quality]
+
+begin
+  require 'kitchen/rake_tasks'
+  Kitchen::RakeTasks.new
+rescue LoadError
+  puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
+end

data/lib/kitchen/driver/docker.rb

@@ -26,7 +26,7 @@ module Kitchen
     # @author Sean Porter <portertech@gmail.com>
     class Docker < Kitchen::Driver::SSHBase
 
-      default_config :socket,        nil
+      default_config :socket,        'unix:///var/run/docker.sock'
       default_config :privileged,    false
       default_config :remove_images, false
       default_config :run_command,   '/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no'
@@ -45,16 +45,18 @@ module Kitchen
         driver.default_platform
       end
 
+      default_config :disable_upstart, true
+
       def verify_dependencies
         run_command('docker > /dev/null', :quiet => true)
         rescue
           raise UserError,
-          'You must first install Docker http://www.docker.io/gettingstarted/'
+          'You must first install the Docker CLI tool http://www.docker.io/gettingstarted/'
       end
 
       def default_image
         platform, release = instance.platform.name.split('-')
-        release ? [platform, release].join(':') : 'base'
+        release ? [platform, release].join(':') : platform
       end
 
       def default_platform
@@ -96,13 +98,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
+          config[:disable_upstart] ? disable_upstart + packages : packages
         when 'rhel', 'centos'
           <<-eos
             RUN yum clean all

data/lib/kitchen/driver/docker_version.rb

@@ -19,6 +19,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "0.13.0"
+    DOCKER_VERSION = "1.0.0.beta"
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 1.0.0.beta
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0.rc.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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'
 - !ruby/object:Gem::Dependency
   name: cane
   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: tailor
   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: countloc
   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: A Test Kitchen Driver for Docker
@@ -101,10 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .cane
-- .gitignore
-- .tailor
-- .travis.yml
+- ".cane"
+- ".gitignore"
+- ".kitchen.yml"
+- ".tailor"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -123,19 +124,18 @@ 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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Docker
 test_files: []
-has_rdoc: