kitchen-docker 1.1.0.beta → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407a5d776917562de10e0e79bd86bffa9e48d9b3
-  data.tar.gz: 3569d2059afb5caa1db2082772b2c2825f98c063
+  metadata.gz: 86592dc15baa47fd6da302f7c30d88f358f02e46
+  data.tar.gz: c595e77b2dbc2c200a1e4dcc3316e648463ee790
 SHA512:
-  metadata.gz: a24c16a5b18228159b77a09f93c426b2eed684fff51f3c3c65bcb343ed5112f601929d767702ebec783ba113779f0a214bc9500613ad1b9aa529c9e50898d244
-  data.tar.gz: 5ac2fc97e00d7003d7d0f42303711384c6d72412146a8fdaf0675a3024ba96a804ed1e1e23125f12a7ce973302c2d73fa9607f12166bb4441ddef0e4b055b2e2
+  metadata.gz: 26921d25432cab0ca8281e2e0880166fcadb2ddc53693974101ae3c7cab6815600db9edde85c9c84e0f752e13582a4d90b32f02d8c46645be2aee0f484a4965b
+  data.tar.gz: 75bcdad585f54c9ffccffc8cdf8f69ada4b240e1741eb1938f23c90a8e789218f677cfff362510da7a931ca38ff64e9a511c5c8d4c198415cc3676fa934f4adb

data/.kitchen.yml

@@ -1,14 +1,30 @@
 ---
 driver:
   name: docker
+  provision_command: curl -L http://www.opscode.com/chef/install.sh | bash
 
 provisioner:
   name: dummy
 
 platforms:
   - name: ubuntu-12.04
+  - name: ubuntu-13.10
   - name: centos-6.4
+  - name: debian
+  - name: arch
+    driver:
+      image: base/arch
   - name: unknown
+    driver:
+      image: ubuntu:12.04
+      platform: ubuntu
+  - name: dockerfile
+    driver:
+      username: dockerfile
+      password: dockerfile
+      dockerfile: test/Dockerfile
+      run_command: /sbin/init
 
 suites:
   - name: default
+  - name: concurrency

data/README.md

@@ -32,7 +32,9 @@ platforms:
 ## Default Configuration
 
 This driver can determine an image and platform type for a select number of
-platforms. Currently, the following platform names are supported:
+platforms.
+
+Examples:
 
 ```
 ---
@@ -58,6 +60,22 @@ platforms:
 
 ## Configuration
 
+### binary
+
+The Docker binary to use.
+
+The default value is `docker`.
+
+Examples:
+
+```
+  binary: docker.io
+```
+
+```
+  binary: /opt/docker
+```
+
 ### socket
 
 The Docker daemon socket to use. By default, Docker will listen on
@@ -81,10 +99,8 @@ Examples:
 The Docker image to use as the base for the suite containers. You can find
 images using the [Docker Index][docker_index].
 
-The default will be determined by the Platform name, if a default exists
-(see the Default Configuration section for more details). If a default
-cannot be computed, then the default value is `base`, an official Ubuntu
-[image][docker_default_image].
+The default will be computed, using the platform name (see the Default
+Configuration section for more details).
 
 ### platform
 
@@ -94,9 +110,8 @@ suite container for Test Kitchen. Kitchen Docker currently supports:
 * `debian` or `ubuntu`
 * `rhel` or `centos`
 
-The default will be determined by the Platform name, if a default exists
-(see the Default Configuration section for more details). If a default
-cannot be computed, then the default value is `ubuntu`.
+The default will be computed, using the platform name (see the Default
+Configuration section for more details).
 
 ### require\_chef\_omnibus
 
@@ -252,6 +267,16 @@ Examples:
   privileged: true
 ```
 
+## dockerfile
+
+Use a custom Dockerfile, instead of having Kitchen-Docker build one for you.
+
+Examples:
+
+```
+  dockerfile: test/Dockerfile
+```
+
 ## Development
 
 * Source hosted at [GitHub][repo]

data/lib/kitchen/driver/docker.rb

@@ -16,6 +16,7 @@
 
 require 'kitchen'
 require 'json'
+require File.join(File.dirname(__FILE__), 'docker', 'erb')
 
 module Kitchen
 
@@ -26,6 +27,7 @@ module Kitchen
     # @author Sean Porter <portertech@gmail.com>
     class Docker < Kitchen::Driver::SSHBase
 
+      default_config :binary,        'docker'
       default_config :socket,        'unix:///var/run/docker.sock'
       default_config :privileged,    false
       default_config :use_cache,     true
@@ -49,7 +51,7 @@ module Kitchen
       default_config :disable_upstart, true
 
       def verify_dependencies
-        run_command('docker > /dev/null', :quiet => true)
+        run_command("#{config[:binary]} > /dev/null", :quiet => true)
         rescue
           raise UserError,
           'You must first install the Docker CLI tool http://www.docker.io/gettingstarted/'
@@ -61,7 +63,7 @@ module Kitchen
       end
 
       def default_platform
-        instance.platform.name.split('-').first || 'ubuntu'
+        instance.platform.name.split('-').first
       end
 
       def create(state)
@@ -73,7 +75,7 @@ module Kitchen
       end
 
       def destroy(state)
-        rm_container(state) if state[:container_id]
+        rm_container(state) if container_exists?(state)
         if config[:remove_images] && state[:image_id]
           rm_image(state)
         end
@@ -90,12 +92,12 @@ module Kitchen
       end
 
       def docker_command(cmd, options={})
-        docker = "docker"
+        docker = config[:binary].dup
         docker << " -H #{config[:socket]}" if config[:socket]
-        run_command("#{docker} #{cmd}", options)
+        run_command("#{docker} #{cmd}", options.merge(:quiet => !logger.debug?))
       end
 
-      def dockerfile
+      def build_dockerfile
         from = "FROM #{config[:image]}"
         platform = case config[:platform]
         when 'debian', 'ubuntu'
@@ -113,8 +115,15 @@ module Kitchen
           <<-eos
             RUN yum clean all
             RUN yum install -y sudo openssh-server openssh-clients which curl
-            RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
-            RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
+            RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+            RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
+          eos
+        when 'arch'
+          <<-eos
+            RUN pacman -Syu --noconfirm
+            RUN pacman -S --noconfirm openssh sudo curl
+            RUN ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
+            RUN ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
           eos
         else
           raise ActionFailed,
@@ -135,6 +144,16 @@ module Kitchen
         [from, platform, base, custom].join("\n")
       end
 
+      def dockerfile
+        if config[:dockerfile]
+          template = IO.read(File.expand_path(config[:dockerfile]))
+          context = DockerERBContext.new(config.to_hash)
+          ERB.new(template).result(context.get_binding)
+        else
+          build_dockerfile
+        end
+      end
+
       def parse_image_id(output)
         output.each_line do |line|
           if line =~ /image id|build successful|successfully built/i
@@ -180,6 +199,15 @@ module Kitchen
         parse_container_id(output)
       end
 
+      def inspect_container(state)
+        container_id = state[:container_id]
+        docker_command("inspect #{container_id}")
+      end
+
+      def container_exists?(state)
+        !!inspect_container(state) rescue false
+      end
+
       def parse_container_ssh_port(output)
         begin
           info = Array(::JSON.parse(output)).first
@@ -193,8 +221,7 @@ module Kitchen
       end
 
       def container_ssh_port(state)
-        container_id = state[:container_id]
-        output = docker_command("inspect #{container_id}")
+        output = inspect_container(state)
         parse_container_ssh_port(output)
       end
 

data/lib/kitchen/driver/docker/erb.rb

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+#
+# Copyright (C) 2013, Sean Porter
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'erb'
+
+module Kitchen
+
+  module Driver
+
+    class DockerERBContext
+      def initialize(config={})
+        config.each do |key, value|
+          instance_variable_set('@' + key.to_s, value)
+        end
+      end
+
+      def get_binding
+        binding
+      end
+    end
+  end
+end

data/lib/kitchen/driver/docker_version.rb

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

data/test/Dockerfile

@@ -0,0 +1,10 @@
+FROM centos:6.4
+RUN yum clean all
+RUN yum install -y sudo openssh-server openssh-clients which curl htop
+RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
+RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
+RUN mkdir -p /var/run/sshd
+RUN useradd -d /home/<%= @username %> -m -s /bin/bash <%= @username %>
+RUN echo <%= "#{@username}:#{@password}" %> | chpasswd
+RUN echo '<%= @username %> ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+RUN curl -L http://www.opscode.com/chef/install.sh | bash

data/test/integration/default/serverspec/default_spec.rb

@@ -0,0 +1,8 @@
+require 'serverspec'
+
+include Serverspec::Helper::Exec
+include Serverspec::Helper::DetectOS
+
+describe file('/etc/passwd') do
+  it { should be_file }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -113,7 +113,10 @@ files:
 - Rakefile
 - kitchen-docker.gemspec
 - lib/kitchen/driver/docker.rb
+- lib/kitchen/driver/docker/erb.rb
 - lib/kitchen/driver/docker_version.rb
+- test/Dockerfile
+- test/integration/default/serverspec/default_spec.rb
 homepage: https://github.com/portertech/kitchen-docker
 licenses:
 - Apache 2.0
@@ -129,13 +132,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Docker
-test_files: []
+test_files:
+- test/Dockerfile
+- test/integration/default/serverspec/default_spec.rb