kitchen-docker 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b20641569c431d2c7ad9aee8ce47ae6e594f0094
-  data.tar.gz: 4141179aa94c5c3f4edc8b58c9eb48c6502173a2
+  metadata.gz: 8345bffbaf637c87a99f8160ff212ce76444c92d
+  data.tar.gz: 7a813c9f5eef3fab3bde68284c6c0428e633946e
 SHA512:
-  metadata.gz: 12afef7fe2ef9c9b6c79958efdf70fce090bcc1223e98558b675adc13d7641f1776cde221f4c7b9e07e699b037db2a3037b0f99bf80b882d9ea03426b7be1723
-  data.tar.gz: e685af341d2baffeaaf9dbc59be8056a5d7932ea982b241dd0b96303c8b6d42fc206681e4b95194ed755ebd8135e3750486772723fd0b0a141f03a3ba52cab0e
+  metadata.gz: 4873d4dc1caaaaf7e90b434f55d609ef948ae2e143a98f36431aab13b55ad70bf5b73c0495226cfc2b2035147e218b01e689d5c0de0b096429d986f4be9f16a4
+  data.tar.gz: 47e0fb372d326ce9083335da3b6cd4a0ef8cc87539e294b0860034a007cb67c4668b6e1667429429e7a39fd04455195c9458bf02659f648ed96f8a60c9d1f81c

data/.kitchen.yml

@@ -1,15 +1,16 @@
 ---
 driver:
   name: docker
-  provision_command: curl -L http://www.opscode.com/chef/install.sh | bash
+  provision_command: curl -L http://www.chef.io/chef/install.sh | bash
 
 provisioner:
   name: dummy
 
 platforms:
   - name: ubuntu-12.04
-  - name: ubuntu-13.10
+  - name: ubuntu-14.04
   - name: centos-6.4
+  - name: centos-7
   - name: debian
   - name: arch
     driver:
@@ -24,6 +25,17 @@ platforms:
       password: dockerfile
       dockerfile: test/Dockerfile
       run_command: /sbin/init
+  - name: database
+    driver:
+      image: ubuntu:14.04
+      platform: ubuntu
+      instance_name: db
+      publish_all: true
+  - name: linked
+    driver:
+      image: ubuntu:14.04
+      platform: ubuntu
+      links: "db:db"
 
 suites:
   - name: default

data/CHANGELOG.md

@@ -1,3 +1,17 @@
-## 0.1.0 / Unreleased
+## 1.6.0
 
-* Initial release
+* `publish_all` option to publish all ports to the host interface
+
+* `instance_name` option to name the docker container
+
+* `links` option to link suite instance docker containers
+
+* `socket` option will now default to ENV `DOCKER_HOST` if set
+
+* Fixed verify dependencies output redirection
+
+* Added `fedora` to platform names
+
+* Support for `gentoo` and `gentoo-paludis` platforms
+
+* Adding sudo rule to `/etc/sudoers.d/#{username}` in addition to `/etc/sudoers`

data/README.md

@@ -94,6 +94,13 @@ Examples:
   socket: tcp://docker.example.com:4242
 ```
 
+If you use [Boot2Docker](https://github.com/boot2docker/boot2docker), set your `DOCKER_HOST` environment variable properly (e.g. `export DOCKER_HOST=tcp://192.168.59.103:2375`) or you have to use the following:
+
+```
+socket: tcp://192.168.59.103:2375
+```
+
+
 ### image
 
 The Docker image to use as the base for the suite containers. You can find
@@ -109,6 +116,7 @@ suite container for Test Kitchen. Kitchen Docker currently supports:
 
 * `debian` or `ubuntu`
 * `rhel` or `centos`
+* `gentoo` or `gentoo-paludis`
 
 The default will be computed, using the platform name (see the Default
 Configuration section for more details).
@@ -165,6 +173,14 @@ containers.
 
 The default value is `true`.
 
+### use\_sudo
+
+This determines if Docker commands are run with `sudo`.
+
+The default value depends on the type of socket being used. For local sockets, the default value is `true`. For remote sockets, the default value is `false`.
+
+This should be set to `false` if you're using boot2docker, as every command passed into the VM runs as root by default.
+
 ### remove\_images
 
 This determines if images are automatically removed when the suite container is
@@ -176,7 +192,7 @@ The default value is `false`.
 
 Sets the command used to run the suite container.
 
-The default value is `/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no`.
+The default value is `/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no -o PasswordAuthentication=yes`.
 
 Examples:
 
@@ -210,7 +226,24 @@ Examples:
   - /srv
 ```
 
-## dns
+### volumes_from
+
+Mount volumes managed by other containers.
+
+Examples:
+
+```
+  volumes_from: repos
+```
+
+```
+  volumes_from:
+  - repos
+  - logging
+  - rvm
+```
+
+### dns
 
 Adjusts `resolv.conf` to use the dns servers specified. Otherwise use
 Dockers defaults.
@@ -228,7 +261,7 @@ Examples:
 ```
 ### http\_proxy
 
-Sets an http proxy for the suite container using the `http_proxy` environment variable. 
+Sets an http proxy for the suite container using the `http_proxy` environment variable.
 
 Examples:
 
@@ -294,6 +327,47 @@ Examples:
   dockerfile: test/Dockerfile
 ```
 
+### instance_name
+
+Set the name of container to link to other container(s).
+
+Examples:
+
+```
+  instance_name: web
+```
+
+### links
+
+Set ```instance_name```(and alias) of other container(s) that connect from the suite container.
+
+Examples:
+
+```
+ links: db:db
+```
+
+Examples:
+
+```
+  links:
+  - db:db
+  - kvs:kvs
+```
+
+### publish_all
+
+Publish all exposed ports to the host interfaces.
+This option used to communicate between some containers.
+
+The default value is `false`.
+
+Examples:
+
+```
+  publish_all: true
+```
+
 ## Development
 
 * Source hosted at [GitHub][repo]

data/kitchen-docker.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Kitchen::Driver::DOCKER_VERSION
   spec.authors       = ['Sean Porter']
   spec.email         = ['portertech@gmail.com']
-  spec.description   = %q{A Test Kitchen Driver for Docker}
+  spec.description   = %q{A Docker Driver for Test Kitchen}
   spec.summary       = spec.description
   spec.homepage      = 'https://github.com/portertech/kitchen-docker'
   spec.license       = 'Apache 2.0'

data/lib/kitchen/driver/docker.rb

@@ -29,11 +29,12 @@ module Kitchen
     class Docker < Kitchen::Driver::SSHBase
 
       default_config :binary,        'docker'
-      default_config :socket,        'unix:///var/run/docker.sock'
+      default_config :socket,        ENV['DOCKER_HOST'] || 'unix:///var/run/docker.sock'
       default_config :privileged,    false
       default_config :use_cache,     true
       default_config :remove_images, false
-      default_config :run_command,   '/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no -o UsePrivilegeSeparation=no -o PidFile=/tmp/sshd.pid'
+      default_config :run_command,   '/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no -o PasswordAuthentication=yes ' +
+                                     '-o UsePrivilegeSeparation=no -o PidFile=/tmp/sshd.pid'
       default_config :username,      'kitchen'
       default_config :password,      'kitchen'
       default_config :tls,           false
@@ -41,6 +42,7 @@ module Kitchen
       default_config :tls_cacert,    nil
       default_config :tls_cert,      nil
       default_config :tls_key,       nil
+      default_config :publish_all,   false
 
       default_config :use_sudo do |driver|
         !driver.remote_socket?
@@ -57,7 +59,7 @@ module Kitchen
       default_config :disable_upstart, true
 
       def verify_dependencies
-        run_command("#{config[:binary]} > /dev/null", :quiet => true)
+        run_command("#{config[:binary]} >> /dev/null 2>&1", :quiet => true)
         rescue
           raise UserError,
           'You must first install the Docker CLI tool http://www.docker.io/gettingstarted/'
@@ -125,7 +127,7 @@ module Kitchen
             RUN apt-get install -y sudo openssh-server curl lsb-release
           eos
           config[:disable_upstart] ? disable_upstart + packages : packages
-        when 'rhel', 'centos'
+        when 'rhel', 'centos', 'fedora'
           <<-eos
             RUN yum clean all
             RUN yum install -y sudo openssh-server openssh-clients which curl
@@ -139,6 +141,20 @@ module Kitchen
             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
+        when 'gentoo'
+          <<-eos
+            RUN emerge sync
+            RUN emerge net-misc/openssh app-admin/sudo
+            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
+        when 'gentoo-paludis'
+          <<-eos
+            RUN cave sync
+            RUN cave resolve -zx net-misc/openssh app-admin/sudo
+            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,
           "Unknown platform '#{config[:platform]}'"
@@ -149,6 +165,7 @@ module Kitchen
           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 echo '#{username} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/#{username}
         eos
         custom = ''
         Array(config[:provision_command]).each do |cmd|
@@ -199,6 +216,9 @@ module Kitchen
         Array(config[:dns]).each {|dns| cmd << " -dns #{dns}"}
         Array(config[:volume]).each {|volume| cmd << " -v #{volume}"}
         Array(config[:volumes_from]).each {|container| cmd << " --volumes-from #{container}"}
+        Array(config[:links]).each {|link| cmd << " --link #{link}"}
+        cmd << " --name #{config[:instance_name]}" if config[:instance_name]
+        cmd << " -P" if config[:publish_all]
         cmd << " -h #{config[:hostname]}" if config[:hostname]
         cmd << " -m #{config[:memory]}" if config[:memory]
         cmd << " -c #{config[:cpu]}" if config[:cpu]

data/lib/kitchen/driver/docker_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Test Kitchen Driver for Docker
+description: A Docker Driver for Test Kitchen
 email:
 - portertech@gmail.com
 executables: []
@@ -137,10 +137,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A Test Kitchen Driver for Docker
+summary: A Docker Driver for Test Kitchen
 test_files:
 - test/Dockerfile
 - test/integration/default/serverspec/default_spec.rb