kitchen-docker 2.15.0 → 3.2.3

data/{test/spec → spec}/spec_helper.rb

@@ -14,32 +14,11 @@
 # limitations under the License.
 #
 
-require 'rake'
-require 'rspec'
-require 'rspec/its'
-require 'simplecov'
+require "rake"
+require "rspec"
+require "rspec/its"
 
-# Check for coverage stuffs
-formatters = []
-
-if ENV['CODECOV_TOKEN'] || ENV['TRAVIS']
-  require 'codecov'
-  formatters << SimpleCov::Formatter::Codecov
-end
-
-unless formatters.empty?
-  SimpleCov.formatters = formatters
-end
-
-SimpleCov.start do
-  # Don't get coverage on the test cases themselves.
-  add_filter '/spec/'
-  add_filter '/test/'
-  # Codecov doesn't automatically ignore vendored files.
-  add_filter '/vendor/'
-end
-
-require 'kitchen/driver/docker'
+require "kitchen/driver/docker"
 
 RSpec.configure do |config|
   # Basic configuraiton
@@ -50,5 +29,5 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 end

data/test/Dockerfile

@@ -1,8 +1,7 @@
-FROM centos:7
-RUN yum clean all
-RUN yum install -y sudo openssh-server openssh-clients which curl htop
+FROM almalinux:latest
+RUN dnf clean all
+RUN dnf 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 mkdir -p /var/run/sshd
 RUN useradd -d /home/<%= @username %> -m -s /bin/bash <%= @username %>
 RUN echo <%= "#{@username}:#{@password}" %> | chpasswd
@@ -13,5 +12,5 @@ RUN chmod 0700 /home/<%= @username %>/.ssh
 RUN touch /home/<%= @username %>/.ssh/authorized_keys
 RUN chown <%= @username %> /home/<%= @username %>/.ssh/authorized_keys
 RUN chmod 0600 /home/<%= @username %>/.ssh/authorized_keys
-RUN curl -L https://www.chef.io/chef/install.sh | bash
+RUN curl -L https://omnitruck.cinc.sh/install.sh | bash
 RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/authorized_keys

data/test/cookbooks/cinc_test/metadata.rb

@@ -0,0 +1,2 @@
+name "cinc_test"
+version "0.0.1"

data/test/cookbooks/cinc_test/recipes/default.rb

@@ -0,0 +1,10 @@
+file_path = if windows?
+              "C:/cinc-converged"
+            else
+              "/tmp/cinc-converged"
+            end
+
+file file_path do
+  content "ok\n"
+  mode "0644"
+end

data/test/cookbooks/docker_test/attributes/default.rb

@@ -0,0 +1 @@
+default["docker_test"]["revision"] = "main"

data/test/cookbooks/docker_test/metadata.rb

@@ -0,0 +1,3 @@
+name "dokken_test"
+version "0.0.1"
+depends "docker"

data/test/cookbooks/docker_test/recipes/default.rb

@@ -0,0 +1,94 @@
+user "notroot" do
+  home "/home/notroot"
+  manage_home true
+  action :create
+end
+
+package %w{
+  gcc-c++
+  gcc
+  git
+  iputils
+  libffi
+  libffi-devel
+  make
+  net-tools
+  nmap
+  procps-ng
+  redhat-rpm-config
+  ruby
+  ruby-devel
+  rubygem-bundler
+  rubygem-io-console
+  rubygem-rake
+  telnet
+  which
+}
+
+docker_service "default" do
+  host ["tcp://127.0.0.1"]
+  action %i{create start}
+end
+
+git "/home/notroot/kitchen-docker" do
+  repository "/opt/kitchen-docker/.git"
+  revision node["docker_test"]["revision"]
+  user "notroot"
+  action :sync
+end
+
+execute "install gem bundle" do
+  command "/usr/bin/bundle install --without development --path vendor/bundle"
+  cwd "/home/notroot/kitchen-docker"
+  user "notroot"
+  live_stream false
+  creates "/home/notroot/kitchen-docker/Gemfile.lock"
+  environment "HOME" => "/home/notroot"
+  action :run
+end
+
+execute "Test Kitchen verify hello" do
+  command <<-EOH.gsub(/^\s{4}/, "").chomp
+    /usr/bin/bundle exec kitchen create hello -l debug
+    /usr/bin/bundle exec kitchen converge hello -l debug
+    /usr/bin/bundle exec kitchen verify hello -l debug
+  EOH
+  cwd "/home/notroot/kitchen-docker"
+  user "notroot"
+  live_stream true
+  environment "PATH" => "/usr/bin:/usr/local/bin:/home/notroot/bin",
+    "HOME" => "/home/notroot",
+    "DOCKER_HOST" => "tcp://127.0.0.1:2375",
+    "CHEF_LICENSE" => "accept-no-persist"
+  action :run
+end
+
+execute "destroy hello again suite" do
+  command "/usr/bin/bundle exec kitchen destroy helloagain"
+  cwd "/home/notroot/kitchen-docker"
+  user "notroot"
+  live_stream true
+  environment "PATH" => "/usr/bin:/usr/local/bin:/home/notroot/bin",
+    "HOME" => "/home/notroot",
+    "DOCKER_HOST" => "tcp://127.0.0.1:2375"
+  action :run
+end
+
+docker_tag "local-example" do
+  target_repo "fedora"
+  target_tag "latest"
+  to_repo "local-example"
+  to_tag "latest"
+end
+
+execute "Test Kitchen verify without image pull" do
+  command "/usr/bin/bundle exec kitchen test local_image -l debug"
+  cwd "/home/notroot/kitchen-docker"
+  user "notroot"
+  live_stream true
+  environment "PATH" => "/usr/bin:/usr/local/bin:/home/notroot/bin",
+    "HOME" => "/home/notroot",
+    "DOCKER_HOST" => "tcp://127.0.0.1:2375",
+    "CHEF_LICENSE" => "accept-no-persist"
+  action :run
+end

data/test/integration/capabilities/{serverspec → disabled}/capabilities_drop_spec.rb

@@ -14,10 +14,11 @@
 # limitations under the License.
 #
 
-require 'serverspec'
-set :backend, :exec
+# Disable now busser-serever is gone.
+# require 'serverspec'
+# set :backend, :exec
 
-describe command('/sbin/ifconfig eth0 multicast') do
-  its(:exit_status) { is_expected.to_not eq 0 }
-  its(:stderr) { is_expected.to match /Operation not permitted/ }
-end
+# describe command('/sbin/ifconfig eth0 multicast') do
+#   its(:exit_status) { is_expected.to_not eq 0 }
+#   its(:stderr) { is_expected.to match /Operation not permitted/ }
+# end

data/test/integration/cinc/inspec/cinc_spec.rb

@@ -0,0 +1,21 @@
+file_path = if os.windows?
+              "C:/cinc-converged"
+            else
+              "/tmp/cinc-converged"
+            end
+
+describe file(file_path) do
+  it { should exist }
+  its(:content) { should eq "ok\n" }
+end
+
+cinc_cmd = if os.windows?
+             'C:\cinc-project\cinc\bin\cinc-client --version'
+           else
+             "/opt/cinc/bin/cinc-client --version"
+           end
+
+describe command(cinc_cmd) do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should match(/Cinc Client/) }
+end

data/test/integration/default/{serverspec → disabled}/default_spec.rb

@@ -14,10 +14,11 @@
 # limitations under the License.
 #
 
-require 'serverspec'
-require 'spec_helper'
-
+# Disable now busser-server is gone.
+# require "serverspec"
+# require "spec_helper"
+#
 # Just make sure the image launched and is reachable.
-describe command('true') do
-  its(:exit_status) { is_expected.to eq 0 }
-end
+# describe command("true") do
+#   its(:exit_status) { is_expected.to eq 0 }
+# end

data/test/integration/default/{serverspec → disabled}/spec_helper.rb

@@ -12,10 +12,10 @@
 # limitations under the License.
 #
 
-case RbConfig::CONFIG['host_os']
-when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-  set :backend, :cmd
-  set :os, :family => 'windows'
-else
-  set :backend, :exec
-end
+# case RbConfig::CONFIG['host_os']
+# when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+#   set :backend, :cmd
+#   set :os, :family => 'windows'
+# else
+#   set :backend, :exec
+# end

data/test/integration/inspec/inspec_spec.rb

@@ -15,12 +15,12 @@
 #
 
 # Just make sure the image launched and is reachable.
-if os[:family] == 'windows'
-  describe command('echo 1') do
+if os[:family] == "windows"
+  describe command("echo 1") do
     its(:exit_status) { is_expected.to eq 0 }
   end
 else
-  describe command('true') do
+  describe command("true") do
     its(:exit_status) { is_expected.to eq 0 }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 3.2.3
 platform: ruby
 authors:
 - Sean Porter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -17,193 +17,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tailor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: countloc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: kitchen-inspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: train
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 description: A Docker Driver for Test Kitchen
 email:
 - portertech@gmail.com
@@ -211,21 +37,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cane"
-- ".github/dependabot.yml"
+- ".github/CODEOWNERS"
+- ".github/workflows/lint.yml"
+- ".github/workflows/publish.yaml"
 - ".gitignore"
-- ".kitchen.windows.yml"
-- ".kitchen.yml"
-- ".tailor"
-- ".travis.yml"
+- ".markdownlint.yaml"
+- ".release-please-manifest.json"
+- ".rubocop.yml"
+- ".yamllint"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- cookbooks
 - docker.ps1
 - kitchen-docker.gemspec
-- lib/docker/version.rb
+- kitchen.windows.yml
+- kitchen.yml
 - lib/kitchen/docker/container.rb
 - lib/kitchen/docker/container/linux.rb
 - lib/kitchen/docker/container/windows.rb
@@ -239,14 +68,23 @@ files:
 - lib/kitchen/docker/helpers/inspec_helper.rb
 - lib/kitchen/driver/docker.rb
 - lib/kitchen/transport/docker.rb
-- lib/train/docker.rb
+- release-please-config.json
+- renovate.json
+- spec/docker_spec.rb
+- spec/dockerfile_helper_spec.rb
+- spec/inspec_helper_spec.rb
+- spec/spec_helper.rb
 - test/Dockerfile
-- test/integration/capabilities/serverspec/capabilities_drop_spec.rb
-- test/integration/default/serverspec/default_spec.rb
-- test/integration/default/serverspec/spec_helper.rb
+- test/cookbooks/cinc_test/metadata.rb
+- test/cookbooks/cinc_test/recipes/default.rb
+- test/cookbooks/docker_test/attributes/default.rb
+- test/cookbooks/docker_test/metadata.rb
+- test/cookbooks/docker_test/recipes/default.rb
+- test/integration/capabilities/disabled/capabilities_drop_spec.rb
+- test/integration/cinc/inspec/cinc_spec.rb
+- test/integration/default/disabled/default_spec.rb
+- test/integration/default/disabled/spec_helper.rb
 - test/integration/inspec/inspec_spec.rb
-- test/spec/docker_spec.rb
-- test/spec/spec_helper.rb
 homepage: https://github.com/test-kitchen/kitchen-docker
 licenses:
 - Apache 2.0
@@ -266,15 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A Docker Driver for Test Kitchen
-test_files:
-- test/Dockerfile
-- test/integration/capabilities/serverspec/capabilities_drop_spec.rb
-- test/integration/default/serverspec/default_spec.rb
-- test/integration/default/serverspec/spec_helper.rb
-- test/integration/inspec/inspec_spec.rb
-- test/spec/docker_spec.rb
-- test/spec/spec_helper.rb
+test_files: []

data/.github/dependabot.yml

@@ -1,7 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10

data/.kitchen.windows.yml

@@ -1,33 +0,0 @@
-<% # Make sure the local copy of the driver is loaded %>
-<% lib = File.expand_path('../lib', __FILE__) %>
-<% $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) %>
----
-driver:
-  name: docker
-  provision_command: 
-    - powershell -ExecutionPolicy Bypass -NoLogo -Command . { iwr -useb https://omnitruck.chef.io/install.ps1 } ^| iex; install
-    - powershell -Command $path=$env:Path + ';c:\opscode\chef\embedded\bin'; Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path
-
-transport:
-  name: docker
-  socket: tcp://localhost:2375
-
-provisioner:
-  name: dummy
-
-platforms:
-- name: windows
-  driver_config:
-    image: mcr.microsoft.com/windows/servercore:1809
-    platform: windows
-
-suites:
-- name: default
-- name: context
-  driver:
-    build_context: false
-- name: inspec
-  driver:
-    provision_command: echo 1
-  verifier:
-    name: inspec

data/.kitchen.yml

@@ -1,65 +0,0 @@
-<% # Make sure the local copy of the driver is loaded %>
-<% lib = File.expand_path('../lib', __FILE__) %>
-<% $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) %>
----
-driver:
-  name: docker
-  provision_command: curl -L https://www.chef.io/chef/install.sh | bash
-
-transport:
-  name: docker
-
-provisioner:
-  name: dummy
-
-platforms:
-- name: amazonlinux-2
-- name: ubuntu-18.04
-- name: ubuntu-20.04
-- name: fedora-latest
-  driver:
-    provision_command:
-    - yum install libxcrypt-compat -y
-    - curl -L https://www.chef.io/chef/install.sh | bash
-- name: centos-7
-- name: oraclelinux-7
-- name: rockylinux-8
-- name: debian-9
-- name: debian-10
-- name: opensuse-15
-  driver:
-    image: opensuse/leap:15
-- name: dockerfile
-  driver:
-    username: dockerfile
-    password: dockerfile
-    dockerfile: test/Dockerfile
-    run_command: /sbin/init
-
-suites:
-- name: default
-  excludes: [arch, debian-9]
-- name: context
-  excludes: [arch, debian-9]
-  driver:
-    build_context: false
-- name: capabilities
-  includes: [debian-10,ubuntu-18.04,ubuntu-20.04]
-  driver:
-    provision_command:
-    - curl -L https://www.chef.io/chef/install.sh | bash
-    - apt-get install -y net-tools
-    cap_drop:
-    - NET_ADMIN
-- name: arm64
-  excludes: [debian-9]
-  driver:
-    docker_platform: linux/arm64
-- name: amd64
-  driver:
-    docker_platform: linux/amd64
-- name: inspec
-  driver:
-    provision_command: true
-  verifier:
-    name: inspec

data/.tailor

@@ -1,4 +0,0 @@
-Tailor.config do |config|
-  config.formatters "text"
-  config.file_set 'lib/**/*.rb'
-end