kitchen-docker 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6def5c4cbdeb612e67180f08dc4126705ed5f118ef4b4a3f4c29dd93e6ee847
-  data.tar.gz: 5d89415858f3744241fe6287bca0f0a7c489e9a1d21317f4ef4549c4c9e29933
+  metadata.gz: bf681b90a724609efd7b56203766d1e09c50fbab909b041e1e9cd6c0e4d6e07d
+  data.tar.gz: 0b101baa332d10c1fdcb47619cd088cb874819c203713ca661241f955bd7a4b0
 SHA512:
-  metadata.gz: 9123862cd9ff7e5f6c72aca64019cd3a046592829cfcb69bbf38ab56457c1ee5a4549e09050ae3eb9a701645f59e71d29c17834dfa9c599faf0b7782d60cdda2
-  data.tar.gz: 7c0d27e35a005a1c015228d906ebe538e9e782040d1167d1f3bbf2354ea49e88813266a9b2272ec6111c32b3f88dde8328af2ffc961f13e3895ec1331eb53de5
+  metadata.gz: 70314bfc54ff2077b098022aa850b93081010e7e11681492dc274506378659c8010986220703d6db38d8b8f6e64fa82833922beca01080918f16ad9f90a4b65b
+  data.tar.gz: a279ed751961077df27590671e64215ceddf43210fc0ffe6b1283a9308e4f99dd24b8e576fb3d4fc8e8471fc8fa01c569715d2e1df39f2f6379c0bd44942baea

data/.kitchen.yml

@@ -14,6 +14,8 @@ platforms:
 - name: ubuntu-16.04
 - name: centos-6
 - name: centos-7
+- name: oraclelinux-6
+- name: oraclelinux-7
 - name: debian-8
 - name: opensuse-42.2
   driver:
@@ -41,7 +43,7 @@ suites:
   driver:
     build_context: false
 - name: capabilities
-  excludes: [arch,unknown,centos-7,centos-6,dockerfile,opensuse-42.2]
+  excludes: [arch,unknown,centos-7,centos-6,oraclelinux-6,oraclelinux-7,dockerfile,opensuse-42.2]
   driver:
     provision_command:
     - curl -L https://www.chef.io/chef/install.sh | bash

data/.travis.yml

@@ -10,11 +10,6 @@ rvm:
 services:
 - docker
 
-cache:
-  bundler: true
-  directories:
-  - /var/lib/docker
-
 script:
 - bundle exec docker version
 - bundle exec kitchen --version

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Kitchen-Docker Changelog
 
+## 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.
+* Resolve errors while loading libraries on archlinux
+* Fix failures on Ubuntu 18.04
+* Check if image exists before attempting to remove it so we don't fail
+* Add oraclelinux platform support
+* Prevent `uninitialized constant Kitchen::Driver::Docker::Base64` error by requiring `base64`
+
 ## 2.7.0
 
 * Support for SUSE-based container images.

data/README.md

@@ -1,6 +1,6 @@
 # Kitchen-Docker
 
-[![Build Status](https://img.shields.io/travis/test-kitchen/kitchen-docker.svg)](https://travis-ci.org/test-kitchen/kitchen-docker)
+[![Build Status](https://travis-ci.org/test-kitchen/kitchen-docker.svg?branch=master)](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)
 [![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
@@ -482,6 +482,19 @@ Examples:
     net: br3
 ```
 
+### use_internal_docker_network
+
+If you want to use kitchen-docker from within another Docker container you'll
+need to set this to true. When set to true uses port 22 as the SSH port and
+the IP of the container that chef is going to run in as the hostname so that
+you can connect to it over SSH from within another Docker container.
+
+Examples:
+
+```yaml
+  use_internal_docker_network: true
+```
+
 ## Development
 
 * Source hosted at [GitHub][repo]

data/kitchen-docker.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['portertech@gmail.com']
   spec.description   = %q{A Docker Driver for Test Kitchen}
   spec.summary       = spec.description
-  spec.homepage      = 'https://github.com/portertech/kitchen-docker'
+  spec.homepage      = 'https://github.com/test-kitchen/kitchen-docker'
   spec.license       = 'Apache 2.0'
 
   spec.files         = `git ls-files`.split($/)

data/lib/kitchen/driver/docker.rb

@@ -21,6 +21,7 @@ require 'uri'
 require 'net/ssh'
 require 'tempfile'
 require 'shellwords'
+require 'base64'
 
 require 'kitchen/driver/base'
 
@@ -56,6 +57,7 @@ module Kitchen
       default_config :public_key,    File.join(Dir.pwd, '.kitchen', 'docker_id_rsa.pub')
       default_config :build_options, nil
       default_config :run_options,   nil
+      default_config :use_internal_docker_network, false
 
       default_config :use_sudo, false
 
@@ -119,7 +121,12 @@ module Kitchen
         state[:ssh_key] = config[:private_key]
         state[:image_id] = build_image(state) unless state[:image_id]
         state[:container_id] = run_container(state) unless state[:container_id]
-        state[:hostname] = remote_socket? ? socket_uri.host : 'localhost'
+        state[:hostname] = 'localhost'
+        if remote_socket?
+          state[:hostname] = socket_uri.host
+        elsif config[:use_internal_docker_network]
+          state[:hostname] = container_ip(state)
+        end
         state[:port] = container_ssh_port(state)
         if config[:wait_for_sshd]
           instance.transport.connection(state) do |conn|
@@ -131,7 +138,7 @@ module Kitchen
       def destroy(state)
         rm_container(state) if container_exists?(state)
         if config[:remove_images] && state[:image_id]
-          rm_image(state)
+          rm_image(state) if image_exists?(state)
         end
       end
 
@@ -209,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'
+        when 'rhel', 'centos', 'fedora', 'oraclelinux'
           <<-eos
             ENV container docker
             RUN yum clean all
@@ -230,7 +237,7 @@ module Kitchen
           <<-eos
             RUN pacman --noconfirm -Sy archlinux-keyring
             RUN pacman-db-upgrade
-            RUN pacman --noconfirm -Sy openssl openssh sudo curl
+            RUN pacman --noconfirm -Syu openssl openssh sudo curl
             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
@@ -270,6 +277,7 @@ module Kitchen
           RUN touch #{homedir}/.ssh/authorized_keys
           RUN chown #{username} #{homedir}/.ssh/authorized_keys
           RUN chmod 0600 #{homedir}/.ssh/authorized_keys
+          RUN mkdir -p /run/sshd
         eos
         custom = ''
         Array(config[:provision_command]).each do |cmd|
@@ -364,6 +372,10 @@ module Kitchen
         state[:container_id] && !!docker_command("top #{state[:container_id]}") rescue false
       end
 
+      def image_exists?(state)
+        state[:image_id] && !!docker_command("docker inspect --type=image #{state[:image_id]}") rescue false
+      end
+
       def parse_container_ssh_port(output)
         begin
           _host, port = output.split(':')
@@ -376,6 +388,9 @@ module Kitchen
 
       def container_ssh_port(state)
         begin
+          if config[:use_internal_docker_network]
+            return 22
+          end
           output = docker_command("port #{state[:container_id]} 22/tcp")
           parse_container_ssh_port(output)
         rescue
@@ -384,6 +399,17 @@ module Kitchen
         end
       end
 
+      def container_ip(state)
+        begin
+          cmd = "inspect --format '{{ .NetworkSettings.IPAddress }}'"
+          cmd << " #{state[:container_id]}"
+          docker_command(cmd).strip
+        rescue
+          raise ActionFailed,
+          'Error getting internal IP of Docker container'
+        end
+      end
+
       def rm_container(state)
         container_id = state[:container_id]
         docker_command("stop -t 0 #{container_id}")

data/lib/kitchen/driver/docker_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -211,7 +211,7 @@ files:
 - test/integration/inspec/inspec_spec.rb
 - test/spec/docker_spec.rb
 - test/spec/spec_helper.rb
-homepage: https://github.com/portertech/kitchen-docker
+homepage: https://github.com/test-kitchen/kitchen-docker
 licenses:
 - Apache 2.0
 metadata: {}
@@ -230,8 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Docker Driver for Test Kitchen