kitchen-docker 3.0.0 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59f474a4b47b1241d911ba83df23847d6b172347bc0650d29191e9f473dd91ab
-  data.tar.gz: 31e3d8136d2787b36ea1ff0dc7abbace0f75f4cd036806f0c9c90b82c91fa31d
+  metadata.gz: 7c9d06e9cc15a17fcaa0658c0cb33719baf0bbe46211269975ae66dbf5bfed4c
+  data.tar.gz: 367a618236ccbcb315dbe8d69cec049f7f26b5bcd35c640f7dea6d5c5528aed5
 SHA512:
-  metadata.gz: acf29b3e7719ae79e79e628465c0c2fbb5ea412fcbaf21a70155dc545b0e0eea9927b344c8f8cf18711fdb0c57ade058611008be9fba8721f7f70cb9e55c89ee
-  data.tar.gz: 9e475cab2c9c0abd8312865cbdfaa85c00e8f5bb70d2a052f7380513e09b5a30ca317b78a6644109721b2986f94c1f882b8c6478da745768a08275a4e9cf8b30
+  metadata.gz: b17b6a8042a54d09b0e77ef0955d41d3e7b4574e1c634429b1a8a5c06dfed9d02ad86b03d86588f11f328897ae028e0925fbcf4b30b014d3ad81f0670017b80e
+  data.tar.gz: 4821086d0078af8b2919010e7373646922cb17e2549be27537572004f4c95ff7ac39c7fd39a61e1607bbff50e8090d564f309dd168f11b0d3560b242bbd7e1c9

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+@test-kitchen/maintainers

data/.github/workflows/lint.yml

@@ -0,0 +1,99 @@
+---
+name: 'Lint, Unit & Integration Tests'
+
+"on":
+  pull_request:
+
+env:
+  CHEF_LICENSE_KEY: ${{ secrets.CHEF_LICENSE_KEY }}
+
+jobs:
+  lint-unit:
+    uses: test-kitchen/.github/.github/workflows/lint-unit.yml@main
+
+  integration-windows:
+    name: Windows ${{matrix.suite}} ${{matrix.os}}
+    runs-on: windows-latest
+    needs: lint-unit
+    strategy:
+      fail-fast: false
+      matrix:
+        suite:
+          - default
+        os:
+          - windows-2022
+    steps:
+      - uses: actions/checkout@v7
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+      - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
+
+  integration-linux:
+    name: Linux ${{matrix.suite}} ${{matrix.os}}
+    runs-on: ubuntu-latest
+    needs: lint-unit
+    strategy:
+      fail-fast: false
+      matrix:
+        suite:
+          - default
+          - no-build-context
+          - arm64
+          - amd64
+          - inspec
+        os:
+          - almalinux-8
+          - almalinux-9
+          - almalinux-10
+          - amazonlinux-2023
+          - ubuntu-2204
+          - ubuntu-2404
+          - ubuntu-2604
+          - fedora-latest
+          - centos-stream-9
+          - centos-stream-10
+          - oraclelinux-8
+          - oraclelinux-9
+          - oraclelinux-10
+          - rockylinux-8
+          - rockylinux-9
+          - rockylinux-10
+          - debian-13
+          - opensuse-16
+          - dockerfile
+    steps:
+      - uses: actions/checkout@v7
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+      - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
+
+  integration-capabilities:
+    name: Linux ${{matrix.suite}} ${{matrix.os}}
+    runs-on: ubuntu-latest
+    needs: lint-unit
+    strategy:
+      fail-fast: false
+      matrix:
+        suite:
+          - capabilities
+        os:
+          - ubuntu-2204
+          - ubuntu-2404
+          - ubuntu-2604
+    steps:
+      - uses: actions/checkout@v7
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+      - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}

data/.github/workflows/publish.yaml

@@ -0,0 +1,32 @@
+---
+name: release-please
+
+"on":
+  push:
+    branches: [main]
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: googleapis/release-please-action@v5
+        id: release
+        with:
+          token: ${{ secrets.PORTER_GITHUB_TOKEN }}
+
+      - name: Checkout
+        uses: actions/checkout@v7
+        if: ${{ steps.release.outputs.release_created }}
+
+      - name: Build and publish to GitHub Package
+        uses: actionshub/publish-gem-to-github@main
+        if: ${{ steps.release.outputs.release_created }}
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          owner: ${{ secrets.OWNER }}
+
+      - name: Build and publish to RubyGems
+        uses: actionshub/publish-gem-to-rubygems@main
+        if: ${{ steps.release.outputs.release_created }}
+        with:
+          token: ${{ secrets.RUBYGEMS_API_KEY }}

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 .kitchen.local.yml
 Dockerfile
 .DS_Store
+vendor/

data/.markdownlint.yaml

@@ -0,0 +1,6 @@
+---
+default: true
+MD004: false
+MD012: false
+MD013: false
+MD024: false

data/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "3.2.3"
+}

data/.rubocop.yml

@@ -1,10 +1,9 @@
+---
 require:
-  - chefstyle
+  - cookstyle/chefstyle
 
 AllCops:
   TargetRubyVersion: 3.1
-  Include:
-    - "**/*.rb"
   Exclude:
     - "vendor/**/*"
     - "spec/**/*"

data/CHANGELOG.md

@@ -2,6 +2,46 @@
 
 Future CHANGELOG notes will be in GitHub release notes
 
+## [3.2.3](https://github.com/test-kitchen/kitchen-docker/compare/v3.2.2...v3.2.3) (2026-06-25)
+
+
+### Bug Fixes
+
+* release please configs & tests ([#418](https://github.com/test-kitchen/kitchen-docker/issues/418)) ([9be9d75](https://github.com/test-kitchen/kitchen-docker/commit/9be9d754fd025dd721f1863e23e5502744f5bafb))
+
+## [3.2.2](https://github.com/test-kitchen/kitchen-docker/compare/v3.2.1...v3.2.2) (2026-06-22)
+
+
+### Bug Fixes
+
+* Fix curl package conflict in Amazon Linux 2022 images ([#436](https://github.com/test-kitchen/kitchen-docker/issues/436)) ([4eccec9](https://github.com/test-kitchen/kitchen-docker/commit/4eccec928556a1c6fc48e7fcf14de83a9ced5afa))
+
+## [3.2.1](https://github.com/test-kitchen/kitchen-docker/compare/v3.2.0...v3.2.1) (2026-01-22)
+
+
+### Bug Fixes
+
+* bump tk dep <5 ([#446](https://github.com/test-kitchen/kitchen-docker/issues/446)) ([f27d137](https://github.com/test-kitchen/kitchen-docker/commit/f27d1374c1efd35769563683c5782849162c4f0c))
+* Ignore vendor directory ([#439](https://github.com/test-kitchen/kitchen-docker/issues/439)) ([1c1c6a2](https://github.com/test-kitchen/kitchen-docker/commit/1c1c6a282ba52c2bf48b2ae0b181bc2fb3cf8bab))
+* Remove obsolete Arch Linux limits.conf workaround ([#438](https://github.com/test-kitchen/kitchen-docker/issues/438)) ([ed14bc6](https://github.com/test-kitchen/kitchen-docker/commit/ed14bc6e1f95a0d444471c5aed837d9a0c1d852b))
+* Remove use of DSA keys due to openssh deprecation ([#427](https://github.com/test-kitchen/kitchen-docker/issues/427)) ([f42bd6c](https://github.com/test-kitchen/kitchen-docker/commit/f42bd6c2930becd1524551b8f412ab934a80a326))
+* Support docker build output for Docker Desktop v4.31 ([#423](https://github.com/test-kitchen/kitchen-docker/issues/423)) ([511e4ad](https://github.com/test-kitchen/kitchen-docker/commit/511e4ad36856b9e2eccceb56603586e6cebd296a))
+* Use newer syntax for ENV variables ([#424](https://github.com/test-kitchen/kitchen-docker/issues/424)) ([2007a0d](https://github.com/test-kitchen/kitchen-docker/commit/2007a0dcc6461537412dd46084144beb89731d1a))
+
+## [3.2.0](https://github.com/test-kitchen/kitchen-docker/compare/v3.1.0...v3.2.0) (2023-11-27)
+
+
+### Features
+
+* Tell the user when we can't remove the image if it's in use ([#406](https://github.com/test-kitchen/kitchen-docker/issues/406)) ([bcb7c2b](https://github.com/test-kitchen/kitchen-docker/commit/bcb7c2bc5144ec63c6bde7b8947de33d5484e718))
+
+## [3.1.0](https://github.com/test-kitchen/kitchen-docker/compare/v3.0.0...v3.1.0) (2023-11-27)
+
+
+### Features
+
+* Update workflows ([#410](https://github.com/test-kitchen/kitchen-docker/issues/410)) ([01acb1e](https://github.com/test-kitchen/kitchen-docker/commit/01acb1e00e45d02f71f70f68903c39d320d962df))
+
 ## 2.14.0 - November 13, 2023
 
 - Make sure the /etc/sudoers.d directory exists by @garethgreenaway in [#397](https://github.com/test-kitchen/kitchen-docker/pull/397)

data/Gemfile

@@ -1,3 +1,22 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
+
+group :development do
+  # Integration testing gems.
+  gem "kitchen-cinc-auditor", git: "https://github.com/test-kitchen/kitchen-cinc-auditor.git"
+  gem "cinc-auditor-bin", source: "https://rubygems.cinc.sh"
+  gem "kitchen-cinc"
+  gem "train", ">= 2.1", "< 4.0" # validate 4.x when it's released
+end
+
+group :test do
+  gem "bundler"
+  gem "rake"
+  gem "rspec", "~> 3.2"
+  gem "rspec-its", "~> 2.0"
+end
+
+group :cookstyle do
+  gem "cookstyle"
+end

data/README.md

@@ -127,18 +127,21 @@ Examples:
 
 If you are using the InSpec verifier on Windows, using named pipes for the Docker engine will not work with the Docker transport.
 Set the socket option with the TCP socket address of the Docker engine as shown below:
+
 ```yaml
 socket: tcp://localhost:2375
 ```
 
 The Docker engine must be configured to listen on a TCP port (default port is 2375). This can be configured by editing the configuration file
 (usually located in `C:\ProgramData\docker\config\daemon.json`) and adding the hosts value:
-```
+
+```json
 "hosts": ["tcp://0.0.0.0:2375"]
 ```
 
 Example configuration is shown below:
-```
+
+```json
 {
   "registry-mirrors": [],
   "insecure-registries": [],
@@ -171,6 +174,7 @@ Configuration section for more details).
 The isolation technology for the container. This is not set by default and will use the default container isolation settings.
 
 For example, the following driver configuration options can be used to specify the container isolation technology for Windows containers:
+
 ```yaml
 # Hyper-V
 isolation: hyperv
@@ -238,6 +242,7 @@ driver_config:
   provision_command: curl -L https://www.opscode.com/chef/install.sh | bash
   require_chef_omnibus: false
 ```
+
 ### env_variables
 
 Adds environment variables to Docker container
@@ -287,12 +292,12 @@ Examples:
 ### memory
 
 Sets the memory limit for the suite container in bytes. Otherwise use Dockers
-default. You can read more about `memory.limit_in_bytes` [here][memory_limit].
+default. You can read more about `memory.limit_in_bytes` in the [Resource Management Guide][memory_limit].
 
 ### cpu
 
 Sets the CPU shares (relative weight) for the suite container. Otherwise use
-Dockers defaults. You can read more about cpu.shares [here][cpu_shares].
+Dockers defaults. You can read more about cpu.shares in the [Resource Management Guide][cpu_shares].
 
 ### volume
 
@@ -376,6 +381,7 @@ Examples:
   - 8.8.8.8
   - 8.8.4.4
 ```
+
 ### http\_proxy
 
 Sets an http proxy for the suite container using the `http_proxy` environment variable.
@@ -385,6 +391,7 @@ Examples:
 ```yaml
   http_proxy: http://proxy.host.com:8080
 ```
+
 ### https\_proxy
 
 Sets an https proxy for the suite container using the `https_proxy` environment variable.
@@ -394,6 +401,7 @@ Examples:
 ```yaml
   https_proxy: http://proxy.host.com:8080
 ```
+
 ### forward
 
 Set suite container port(s) to forward to the host machine. You may specify
@@ -525,11 +533,11 @@ Share a host device with the container. Host device must be an absolute path.
 
 Examples:
 
-```
+```yaml
 devices: /dev/vboxdrv
 ```
 
-```
+```yaml
 devices:
   - /dev/vboxdrv
   - /dev/vboxnetctl
@@ -637,6 +645,7 @@ example:
 
 ## License
 
+```text
 Copyright 2013-2016, [Sean Porter](https://github.com/portertech)
 Copyright 2015-2016, [Noah Kantrowitz](https://github.com/coderanger)
 
@@ -651,14 +660,12 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
+```
 
 [issues]:                 https://github.com/test-kitchen/kitchen-docker/issues
-[license]:                https://github.com/test-kitchen/kitchen-docker/blob/master/LICENSE
 [repo]:                   https://github.com/test-kitchen/kitchen-docker
 [docker_installation]:    https://docs.docker.com/installation/#installation
-[docker_upstart_issue]:   https://github.com/dotcloud/docker/issues/223
 [docker_index]:           https://index.docker.io/
-[docker_default_image]:   https://index.docker.io/_/base/
 [test_kitchen_docs]:      https://kitchen.ci/docs/getting-started/introduction/
 [chef_omnibus_dl]:        https://downloads.chef.io/chef-client/
 [cpu_shares]:             https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-cpu.html

data/Rakefile

@@ -1,42 +1,19 @@
 require "bundler/gem_tasks"
-require 'cane/rake_task'
-require 'tailor/rake_task'
 
-desc "Run cane to check quality metrics"
-Cane::RakeTask.new do |cane|
-  cane.canefile = './.cane'
-end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:unit)
 
-Tailor::RakeTask.new
+desc "Run all unit tests"
+task test: %i{unit}
 
-desc "Display LOC stats"
-task :stats do
-  puts "\n## Production Code Stats"
-  sh "countloc -r lib"
+begin
+  require "cookstyle/chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:style) do |task|
+    task.options += ["--display-cop-names", "--no-color"]
+  end
+rescue LoadError
+  puts "cookstyle/chefstyle is not available. (sudo) gem install cookstyle to do style checking."
 end
 
-desc "Run all quality tasks"
-task :quality => [:cane, :tailor, :stats]
-
-task :default => [:quality]
-
-# begin
-#   require 'kitchen/rake_tasks'
-#   Kitchen::RakeTasks.new
-# rescue LoadError
-#   puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
-# end
-
-# Create the spec task.
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec, :tag) do |t, args|
-  t.rspec_opts = [].tap do |a|
-    a << '--color'
-    a << "--format #{ENV['CI'] ? 'documentation' : 'Fuubar'}"
-    a << '--backtrace' if ENV['VERBOSE'] || ENV['DEBUG']
-    a << "--seed #{ENV['SEED']}" if ENV['SEED']
-    a << "--tag #{args[:tag]}" if args[:tag]
-    a << "--default-path test"
-    a << '-I test/spec'
-  end.join(' ')
-end
+task default: %i{style test}

data/cookbooks

@@ -0,0 +1 @@
+test/cookbooks

data/kitchen-docker.gemspec

@@ -1,40 +1,19 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'kitchen/docker/docker_version'
+require "kitchen/docker/docker_version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'kitchen-docker'
+  spec.name          = "kitchen-docker"
   spec.version       = Kitchen::Docker::DOCKER_VERSION
-  spec.authors       = ['Sean Porter']
-  spec.email         = ['portertech@gmail.com']
+  spec.authors       = ["Sean Porter"]
+  spec.email         = ["portertech@gmail.com"]
   spec.description   = %q{A Docker Driver for Test Kitchen}
   spec.summary       = spec.description
-  spec.homepage      = 'https://github.com/test-kitchen/kitchen-docker'
-  spec.license       = 'Apache 2.0'
+  spec.homepage      = "https://github.com/test-kitchen/kitchen-docker"
+  spec.license       = "Apache 2.0"
 
   spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'test-kitchen', '>= 1.0.0'
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-
-  # Style checker gems.
-  spec.add_development_dependency 'cane'
-  spec.add_development_dependency 'tailor'
-  spec.add_development_dependency 'countloc'
-
-  # Unit testing gems.
-  spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'rspec-its', '~> 1.2'
-  spec.add_development_dependency 'fuubar', '~> 2.0'
-  spec.add_development_dependency 'simplecov', '~> 0.9'
-  spec.add_development_dependency 'codecov', '~> 0.0', '>= 0.0.2'
-  spec.add_development_dependency 'chefstyle'
-
-  # Integration testing gems.
-  spec.add_development_dependency 'kitchen-inspec', '~> 2.0'
-  spec.add_development_dependency 'train', '>= 2.1', '< 4.0' # validate 4.x when it's released
+  spec.add_dependency "test-kitchen", ">= 1.0.0", "< 5.0"
 end

data/kitchen.windows.yml

@@ -13,12 +13,12 @@ transport:
   socket: tcp://localhost:2375
 
 provisioner:
-  name: dummy
+  name: cinc_infra
 
 platforms:
   - name: windows
     driver_config:
-      image: mcr.microsoft.com/windows/servercore:1809
+      image: mcr.microsoft.com/windows/servercore:ltsc2022
       platform: windows
 
 suites:
@@ -27,7 +27,5 @@ suites:
     driver:
       build_context: false
   - name: inspec
-    driver:
-      provision_command: echo 1
     verifier:
       name: inspec

data/kitchen.yml

@@ -1,62 +1,94 @@
-# <% # 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
+  provision_command: curl -L https://omnitruck.cinc.sh/install.sh | bash
 
 transport:
   name: docker
 
 provisioner:
-  name: dummy
+  name: cinc_infra
+  install_strategy: skip
+
+verifier:
+  name: cinc_auditor
 
 platforms:
-  - name: amazonlinux-2
-  - name: ubuntu-18.04
-  - name: ubuntu-20.04
+  - name: almalinux-8
+  - name: almalinux-9
+  - name: almalinux-10
+  - name: amazonlinux-2023
+  - name: ubuntu-22.04
+  - name: ubuntu-24.04
+  - name: ubuntu-26.04
   - name: fedora-latest
+  - name: centos-stream-9
     driver:
-      provision_command:
-        - yum install libxcrypt-compat -y
-        - curl -L https://www.chef.io/chef/install.sh | bash
-  - name: centos-7
-  - name: oraclelinux-7
+      image: dokken/centos-stream-9
+  - name: centos-stream-10
+    driver:
+      image: dokken/centos-stream-10
+  - name: oraclelinux-8
+  - name: oraclelinux-9
+  - name: oraclelinux-10
   - name: rockylinux-8
-  - name: debian-11
-  - name: debian-12
-  - name: opensuse-15
+  - name: rockylinux-9
+  - name: rockylinux-10
     driver:
-      image: opensuse/leap:15
+      image: dokken/rockylinux-10
+  - name: debian-13
+  - name: opensuse-16
+    driver:
+      image: opensuse/leap:16
   - name: dockerfile
     driver:
       username: dockerfile
       password: dockerfile
       dockerfile: test/Dockerfile
-      run_command: /sbin/init
+  - name: windows-2022
+    driver:
+      image: mcr.microsoft.com/windows/servercore:ltsc2022
+      provision_command:
+        - powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; iex ((New-Object System.Net.WebClient).DownloadString('https://omnitruck.cinc.sh/install.ps1')); Install-Project -Project cinc -Channel stable"
+    provisioner:
+      cinc_omnibus_root: 'C:\cinc-project\cinc'
+    verifier:
+      name: dummy  # cinc_auditor uses WinRM for Windows but Windows containers don't have WinRM; verify via follow-up
 
 suites:
   - name: default
+    run_list:
+      - recipe[cinc_test::default]
+    verifier:
+      inspec_tests:
+        - test/integration/cinc/inspec
+  - name: docker-test
+    run_list:
+      - recipe[docker_test::default]
+    attributes:
+      docker_test:
+        revision: <%= `git rev-parse HEAD` %>
   - name: no_build_context
+    run_list:
+      - recipe[cinc_test::default]
     driver:
       build_context: false
   - name: capabilities
-    includes: [debian-11, ubuntu-18.04, ubuntu-20.04]
+    run_list:
+      - recipe[cinc_test::default]
     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
+    run_list:
+      - recipe[cinc_test::default]
     driver:
       docker_platform: linux/arm64
   - name: amd64
+    run_list:
+      - recipe[cinc_test::default]
     driver:
       docker_platform: linux/amd64
   - name: inspec
-    driver:
-      provision_command: true
-    verifier:
-      name: inspec
+    run_list:
+      - recipe[cinc_test::default]