kitchen-docker 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac3e853fa14d2d248cd9f28c81dc1cdfd4e246c8
-  data.tar.gz: 55abcccf7441c4fca218443ffecae6170579fd62
+SHA256:
+  metadata.gz: e6def5c4cbdeb612e67180f08dc4126705ed5f118ef4b4a3f4c29dd93e6ee847
+  data.tar.gz: 5d89415858f3744241fe6287bca0f0a7c489e9a1d21317f4ef4549c4c9e29933
 SHA512:
-  metadata.gz: 3d43e2069a3ebdaef65ec576f7414c53a04f4a75fbdf63d88461d2260a6880e7bbd3d4fbda01e4b96c6eb247885a1aa4bbe1dbbe3c9d73c9b7f37bf41769d8ce
-  data.tar.gz: bde163aebd028bf17af0a75dcbcb42ba5742a9449e340880793d7458ab662c98066cd881834adf5291dc6a908e0078ea4d205373b887062cd177dfc2081753b4
+  metadata.gz: 9123862cd9ff7e5f6c72aca64019cd3a046592829cfcb69bbf38ab56457c1ee5a4549e09050ae3eb9a701645f59e71d29c17834dfa9c599faf0b7782d60cdda2
+  data.tar.gz: 7c0d27e35a005a1c015228d906ebe538e9e782040d1167d1f3bbf2354ea49e88813266a9b2272ec6111c32b3f88dde8328af2ffc961f13e3895ec1331eb53de5

data/.kitchen.yml

@@ -10,19 +10,21 @@ provisioner:
   name: dummy
 
 platforms:
-- name: ubuntu-12.04
 - name: ubuntu-14.04
 - name: ubuntu-16.04
 - name: centos-6
 - name: centos-7
-- name: debian
-- name: arch
+- name: debian-8
+- name: opensuse-42.2
   driver:
-    image: base/archlinux
-    provision_command: true
+    image: opensuse:42.2
+# - name: arch
+#   driver:
+#     image: base/archlinux
+#     provision_command: true
 - name: unknown
   driver:
-    image: ubuntu:12.04
+    image: ubuntu:16.04
     platform: ubuntu
 - name: dockerfile
   driver:
@@ -39,7 +41,7 @@ suites:
   driver:
     build_context: false
 - name: capabilities
-  excludes: [arch,unknown,centos-7,centos-6,dockerfile]
+  excludes: [arch,unknown,centos-7,centos-6,dockerfile,opensuse-42.2]
   driver:
     provision_command:
     - curl -L https://www.chef.io/chef/install.sh | bash

data/.travis.yml

@@ -3,9 +3,9 @@ dist: trusty
 language: ruby
 
 rvm:
-- "2.1.9"
-- "2.2.5"
 - "2.3.1"
+- "2.4.3"
+- "2.5.1"
 
 services:
 - docker

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Kitchen-Docker Changelog
 
+## 2.7.0
+
+* Support for SUSE-based container images.
+* Improved support for build context shipping.
+* Changed `use_sudo` to default to `false` in keeping with modern Docker usage.
+
 ## 2.6.0
 
 * Set container name with information from the run so you can identify them

data/README.md

@@ -3,7 +3,6 @@
 [![Build Status](https://img.shields.io/travis/test-kitchen/kitchen-docker.svg)](https://travis-ci.org/test-kitchen/kitchen-docker)
 [![Gem Version](https://img.shields.io/gem/v/kitchen-docker.svg)](https://rubygems.org/gems/kitchen-docker)
 [![Coverage](https://img.shields.io/codecov/c/github/test-kitchen/kitchen-docker.svg)](https://codecov.io/github/test-kitchen/kitchen-docker)
-[![Gemnasium](https://img.shields.io/gemnasium/test-kitchen/kitchen-docker.svg)](https://gemnasium.com/test-kitchen/kitchen-docker)
 [![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 A Test Kitchen Driver for Docker.
@@ -100,6 +99,12 @@ Examples:
   socket: tcp://docker.example.com:4242
 ```
 
+If you use [Docker for Windows](https://docs.docker.com/docker-for-windows/)
+
+```yaml
+socket: npipe:////./pipe/docker_engine
+```
+
 If you use [Boot2Docker](https://github.com/boot2docker/boot2docker)
 or [docker-machine](https://docs.docker.com/machine/get-started/) set
 your `DOCKER_HOST` environment variable properly with `export
@@ -127,6 +132,7 @@ suite container for Test Kitchen. Kitchen Docker currently supports:
 * `debian` or `ubuntu`
 * `rhel` or `centos`
 * `gentoo` or `gentoo-paludis`
+* `opensuse` or `sles`
 
 The default will be computed, using the platform name (see the Default
 Configuration section for more details).

data/lib/kitchen/driver/docker.rb

@@ -57,9 +57,7 @@ module Kitchen
       default_config :build_options, nil
       default_config :run_options,   nil
 
-      default_config :use_sudo do |driver|
-        !driver.remote_socket?
-      end
+      default_config :use_sudo, false
 
       default_config :image do |driver|
         driver.default_image
@@ -202,8 +200,7 @@ module Kitchen
         platform = case config[:platform]
         when 'debian', 'ubuntu'
           disable_upstart = <<-eos
-            RUN dpkg-divert --local --rename --add /sbin/initctl
-            RUN ln -sf /bin/true /sbin/initctl
+            RUN [ ! -f "/sbin/initctl" ] || dpkg-divert --local --rename --add /sbin/initctl && ln -sf /bin/true /sbin/initctl
           eos
           packages = <<-eos
             ENV DEBIAN_FRONTEND noninteractive
@@ -217,8 +214,15 @@ module Kitchen
             ENV container docker
             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 -N ''
-            RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
+            RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+            RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
+          eos
+        when 'opensuse', 'sles'
+          <<-eos
+            ENV container docker
+            RUN zypper install -y sudo openssh which curl
+            RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+            RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
           eos
         when 'arch'
           # See https://bugs.archlinux.org/task/47052 for why we
@@ -227,23 +231,23 @@ module Kitchen
             RUN pacman --noconfirm -Sy archlinux-keyring
             RUN pacman-db-upgrade
             RUN pacman --noconfirm -Sy openssl 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
+            RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
+            RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
             RUN echo >/etc/security/limits.conf
           eos
         when 'gentoo'
           <<-eos
-            RUN emerge sync
+            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
+            RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
+            RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || 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
+            RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
+            RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
           eos
         else
           raise ActionFailed,
@@ -307,7 +311,7 @@ module Kitchen
         output = begin
           file.write(dockerfile)
           file.close
-          docker_command("#{cmd} -f #{Shellwords.escape(file.path)} #{build_context}", :input => dockerfile_contents)
+          docker_command("#{cmd} -f #{Shellwords.escape(dockerfile_path(file))} #{build_context}", :input => dockerfile_contents)
         ensure
           file.close unless file.closed?
           file.unlink
@@ -410,6 +414,10 @@ module Kitchen
         end
       end
 
+      def dockerfile_path(file)
+        config[:build_context] ? Pathname.new(file.path).relative_path_from(Pathname.pwd).to_s : file.path
+      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 = "2.6.0"
+    DOCKER_VERSION = "2.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Docker Driver for Test Kitchen