kitchen-docker 2.12.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc2ec595062530ef1a860930cb80cbdfd1f2d9b0f23f1bd7d261e769679b3a1
-  data.tar.gz: 51b9b8e5f65991cd5dfb26d719301ae55e90d94b2591671617396b993d0c614b
+  metadata.gz: 5d65a3c6ae8fbb16e1fd87e4553a177ccaebc45fbaef3e92e0126b3fc46c2634
+  data.tar.gz: cf847bf5d538fdd037fdd8c446cd9242b29504c413a4a3be502e24b76b14ef60
 SHA512:
-  metadata.gz: 2149ff5a8af75c70e88b93d03f5431e1586d7e0d69d117d742ec591e76fb9aca96b9d8c76e4e9d937c8c398daa4a641d0089c608a6bea9762a0c48b5b9708590
-  data.tar.gz: 6e235534cf2f6ec24dc9cc3e59c10048fe874684c0488dcd15c5ffe0c9409491b27c40683a5945ad5cd857b6c03c72d8d0b90b0446069a0583068aebb5ae5cce
+  metadata.gz: 93d76bf32eaee907b3e284b5dafc2c7e85a2198c2626078b5ba6f85d922157fdbefd3a0d5cfdeaa01bdcd181bee16d1c7fc9ef5ea286fd2624b0c4573703bdb5
+  data.tar.gz: f3a4428581c76cf40eecbce6ecda3a207d72f0dff17788b6f9f0059bad59660955fe2cfe0ac4ffed5b1b933967c044e2889a52d9c8aeb50fa6480077c003c4cf

data/.kitchen.yml

@@ -22,7 +22,6 @@ platforms:
     - yum install libxcrypt-compat -y
     - curl -L https://www.chef.io/chef/install.sh | bash
 - name: centos-7
-- name: centos-8
 - name: oraclelinux-7
 - name: rockylinux-8
 - name: debian-9
@@ -39,13 +38,13 @@ platforms:
 
 suites:
 - name: default
-  excludes: [arch]
+  excludes: [arch, debian-9]
 - name: context
-  excludes: [arch]
+  excludes: [arch, debian-9]
   driver:
     build_context: false
 - name: capabilities
-  includes: [debian-9,debian-10,ubuntu-18.04,ubuntu-20.04]
+  includes: [debian-10,ubuntu-18.04,ubuntu-20.04]
   driver:
     provision_command:
     - curl -L https://www.chef.io/chef/install.sh | bash

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Kitchen-Docker Changelog
 
+## 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)
+- Breaking almalinux platform out by @garethgreenaway [#398](https://github.com/test-kitchen/kitchen-docker/pull/398)
+- fix: parse_image_id: Process "docker build" output in reverse line order by @terminalmage in [#400](https://github.com/test-kitchen/kitchen-docker/pull/400)
+- Allow build temporary Dockerfile in configured custom_dir by @Val in [294](https://github.com/test-kitchen/kitchen-docker/pull/294)
+
+## 2.13.0 - June 10, 2022
+
+- Added CentOSStream and PhotonOS - [@garethgreenaway](https://github.com/garethgreenaway)
+- Fixed image parser when output includes a duration timestamp - [@RulerOf](https://github.com/RulerOf)
+- Updated the test suites - [@RulerOf](https://github.com/RulerOf)
+
 ## 2.12.0 - December 22, 2021
 
 - Support Docker BuildKit - [@RulerOf](https://github.com/RulerOf)

data/README.md

@@ -583,6 +583,16 @@ Examples:
     net: br3
 ```
 
+### build_tempdir
+
+Relative (to `build_context`) temporary directory path for built Dockerfile.
+
+Example:
+
+```yaml
+  build_tempdir: .kitchen
+```
+
 ### use_internal_docker_network
 
 If you want to use kitchen-docker from within another Docker container you'll

data/lib/kitchen/docker/docker_version.rb

@@ -16,6 +16,6 @@
 module Kitchen
   module Docker
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "2.12.0"
+    DOCKER_VERSION = "2.14.0"
   end
 end

data/lib/kitchen/docker/helpers/dockerfile_helper.rb

@@ -34,8 +34,14 @@ module Kitchen
             gentoo_paludis_platform
           when 'opensuse/tumbleweed', 'opensuse/leap', 'opensuse', 'sles'
             opensuse_platform
-          when 'rhel', 'centos', 'oraclelinux', 'amazonlinux', 'almalinux', 'rockylinux'
+          when 'rhel', 'centos', 'oraclelinux', 'amazonlinux', 'rockylinux'
             rhel_platform
+          when 'centosstream'
+            centosstream_platform
+          when 'almalinux'
+            almalinux_platform
+          when 'photon'
+            photonos_platform
           else
             raise ActionFailed, "Unknown platform '#{config[:platform]}'"
           end
@@ -114,11 +120,43 @@ module Kitchen
           CODE
         end
 
+        def centosstream_platform
+          <<-CODE
+            ENV container docker
+            RUN yum clean all
+            RUN yum install -y sudo openssh-server openssh-clients which
+            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 ''
+          CODE
+        end
+
+        def almalinux_platform
+          <<-CODE
+            ENV container docker
+            RUN yum clean all
+            RUN yum install -y sudo openssh-server openssh-clients which
+            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 ''
+          CODE
+        end
+
+        def photonos_platform
+          <<-CODE
+            ENV container docker
+            RUN tdnf clean all
+            RUN tdnf install -y sudo openssh-server openssh-clients which curl
+            RUN [ -f "/etc/ssh/ssh_host_ecdsa_key" ] || ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''
+            RUN [ -f "/etc/ssh/ssh_host_ed25519_key" ] || ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ''
+          CODE
+        end
+
         def dockerfile_base_linux(username, homedir)
           <<-CODE
             RUN if ! getent passwd #{username}; then \
                   useradd -d #{homedir} -m -s /bin/bash -p '*' #{username}; \
                 fi
+            RUN mkdir -p /etc/sudoers.d
+            RUN chmod 0750 /etc/sudoers.d
             RUN echo "#{username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/#{username}
             RUN echo "Defaults !requiretty" >> /etc/sudoers.d/#{username}
             RUN mkdir -p #{homedir}/.ssh

data/lib/kitchen/docker/helpers/image_helper.rb

@@ -13,6 +13,7 @@
 
 require 'kitchen'
 require 'kitchen/configurable'
+require 'pathname'
 require_relative 'cli_helper'
 require_relative 'container_helper'
 
@@ -25,9 +26,9 @@ module Kitchen
         include Kitchen::Docker::Helpers::ContainerHelper
 
         def parse_image_id(output)
-          output.each_line do |line|
-            if line =~ /writing image sha256:[[:xdigit:]]{64} done/i
-              img_id = line[/writing image (sha256:[[:xdigit:]]{64}) done/i,1]
+          output.split("\n").reverse_each do |line|
+            if line =~ /writing image (sha256:[[:xdigit:]]{64})(?: \d*\.\ds)? done/i
+              img_id = line[/writing image (sha256:[[:xdigit:]]{64})(?: \d*\.\ds)? done/i,1]
               return img_id
             end
             if line =~ /image id|build successful|successfully built/i
@@ -50,7 +51,7 @@ module Kitchen
           extra_build_options = config_to_options(config[:build_options])
           cmd << " #{extra_build_options}" unless extra_build_options.empty?
           dockerfile_contents = dockerfile
-          file = Tempfile.new('Dockerfile-kitchen', Dir.pwd)
+          file = Tempfile.new('Dockerfile-kitchen', Pathname.pwd + config[:build_tempdir])
           cmd << " -f #{Shellwords.escape(dockerfile_path(file))}" if config[:build_context]
           build_context = config[:build_context] ? '.' : '-'
           output = begin

data/lib/kitchen/driver/docker.rb

@@ -37,6 +37,7 @@ module Kitchen
 
       default_config :binary,        'docker'
       default_config :build_options, nil
+      default_config :build_tempdir, Dir.pwd
       default_config :cap_add,       nil
       default_config :cap_drop,      nil
       default_config :disable_upstart, true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2023-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A Docker Driver for Test Kitchen