kitchen-docker 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf681b90a724609efd7b56203766d1e09c50fbab909b041e1e9cd6c0e4d6e07d
-  data.tar.gz: 0b101baa332d10c1fdcb47619cd088cb874819c203713ca661241f955bd7a4b0
+  metadata.gz: 0a62c9e97edfb2215e2ad0f991eb88da0d9629e833af0165a78ebf7899894a81
+  data.tar.gz: be82c57778795e8d4b0866ff0b7451eaf499ff81f71703cd3d92cdd2ec92f562
 SHA512:
-  metadata.gz: 70314bfc54ff2077b098022aa850b93081010e7e11681492dc274506378659c8010986220703d6db38d8b8f6e64fa82833922beca01080918f16ad9f90a4b65b
-  data.tar.gz: a279ed751961077df27590671e64215ceddf43210fc0ffe6b1283a9308e4f99dd24b8e576fb3d4fc8e8471fc8fa01c569715d2e1df39f2f6379c0bd44942baea
+  metadata.gz: 68bba42a990ad9335cc62be341448857a7c53312ff210366876f569a42f90e53f1a05fdb80aa263d26e4e2daaeea29fb2a79348fbdefe130ba4d53949aae2ecc
+  data.tar.gz: 886d05137ffe4d7898f1865b7c03d4f504e9c1da7516b920685a32d5592d234cbd0c01d8a222ee266edb6504a85f95b6d2aef590c15131cdd8f89ac452e6f5a1

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .kitchen/
 .kitchen.local.yml
+Dockerfile*

data/.kitchen.yml

@@ -10,16 +10,20 @@ provisioner:
   name: dummy
 
 platforms:
-- name: ubuntu-14.04
+- name: amazonlinux-2
 - name: ubuntu-16.04
+- name: ubuntu-18.04
+- name: fedora-latest
 - name: centos-6
 - name: centos-7
 - name: oraclelinux-6
 - name: oraclelinux-7
 - name: debian-8
-- name: opensuse-42.2
+- name: debian-9
+- name: opensuse-42.3
   driver:
-    image: opensuse:42.2
+    image: opensuse:42.3
+- name: opensuse/leap-42
 # - name: arch
 #   driver:
 #     image: base/archlinux
@@ -43,7 +47,7 @@ suites:
   driver:
     build_context: false
 - name: capabilities
-  excludes: [arch,unknown,centos-7,centos-6,oraclelinux-6,oraclelinux-7,dockerfile,opensuse-42.2]
+  includes: [debian-8,debian-9,ubuntu-16.04,ubuntu-18.04]
   driver:
     provision_command:
     - curl -L https://www.chef.io/chef/install.sh | bash

data/.travis.yml

@@ -1,11 +1,12 @@
-sudo: required
-dist: trusty
+dist: xenial
 language: ruby
+cache: bundler
 
 rvm:
-- "2.3.1"
-- "2.4.3"
-- "2.5.1"
+- 2.3.8
+- 2.4.5
+- 2.5.4
+- 2.6.2
 
 services:
 - docker

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Kitchen-Docker Changelog
 
+## 2.9.0 - Mar 15, 2019
+
+* Add automatic OS detection for amazonlinux, opensuse/leap, and opensuse/tumbleweed
+* On Fedora containers uses dnf to setup the OS not yum
+
 ## 2.8.0 - Jan 18, 2019
 
 * Add new config option `use_internal_docker_network`, which allows running Docker within Docker. See readme for usage details.

data/README.md

@@ -44,8 +44,8 @@ Examples:
 ```yaml
 ---
 platforms:
-- name: ubuntu-12.04
-- name: centos-6.4
+- name: ubuntu-18.04
+- name: centos-7
 ```
 
 This will effectively generate a configuration similar to:
@@ -53,13 +53,13 @@ This will effectively generate a configuration similar to:
 ```yaml
 ---
 platforms:
-- name: ubuntu-12.04
+- name: ubuntu-18.04
   driver_config:
-    image: ubuntu:12.04
+    image: ubuntu:18.04
     platform: ubuntu
-- name: centos-6.4
+- name: centos-7
   driver_config:
-    image: centos:6.4
+    image: centos:7
     platform: centos
 ```
 
@@ -129,10 +129,11 @@ Configuration section for more details).
 The platform of the chosen image. This is used to properly bootstrap the
 suite container for Test Kitchen. Kitchen Docker currently supports:
 
+* `arch`
 * `debian` or `ubuntu`
-* `rhel` or `centos`
+* `amazonlinux`, `rhel`, `centos`, `fedora` or `oraclelinux`
 * `gentoo` or `gentoo-paludis`
-* `opensuse` or `sles`
+* `opensuse/tumbleweed`, `opensuse/leap`, `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

@@ -91,7 +91,7 @@ module Kitchen
         run_command("#{config[:binary]} >> #{dev_null} 2>&1", quiet: true, use_sudo: config[:use_sudo])
         rescue
           raise UserError,
-          'You must first install the Docker CLI tool http://www.docker.io/gettingstarted/'
+          'You must first install the Docker CLI tool https://www.docker.com/get-started'
       end
 
       def dev_null
@@ -216,7 +216,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', 'fedora', 'oraclelinux'
+        when 'rhel', 'centos', 'oraclelinux', 'amazonlinux'
           <<-eos
             ENV container docker
             RUN yum clean all
@@ -224,7 +224,15 @@ module Kitchen
             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'
+        when 'fedora'
+          <<-eos
+            ENV container docker
+            RUN dnf clean all
+            RUN dnf install -y sudo openssh-server openssh-clients 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 'opensuse/tumbleweed', 'opensuse/leap', 'opensuse', 'sles'
           <<-eos
             ENV container docker
             RUN zypper install -y sudo openssh which curl

data/lib/kitchen/driver/docker_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Docker Driver for Test Kitchen