kitchen-docker 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc2ec595062530ef1a860930cb80cbdfd1f2d9b0f23f1bd7d261e769679b3a1
-  data.tar.gz: 51b9b8e5f65991cd5dfb26d719301ae55e90d94b2591671617396b993d0c614b
+  metadata.gz: 8b1291ba7bef7b5a17771a1187a34829acac0b0a78e4185119ecb0e5e23728da
+  data.tar.gz: f1f3b39dc87295717756beab914c0ea5d945c68e318f581717e55b6a65ffbaea
 SHA512:
-  metadata.gz: 2149ff5a8af75c70e88b93d03f5431e1586d7e0d69d117d742ec591e76fb9aca96b9d8c76e4e9d937c8c398daa4a641d0089c608a6bea9762a0c48b5b9708590
-  data.tar.gz: 6e235534cf2f6ec24dc9cc3e59c10048fe874684c0488dcd15c5ffe0c9409491b27c40683a5945ad5cd857b6c03c72d8d0b90b0446069a0583068aebb5ae5cce
+  metadata.gz: f6bcc821a798f066815e2b9da4ef82389b29e53da4dd66bfbb0a228cb2a9b185289621f496d60bea06c5fb54aab388201f4f0c287e4743d2bd809bce4ed264ff
+  data.tar.gz: 6bdc6f960565040e5f8161dd6f64d81059fb9d83c42bf71287cf95c6e31ab50056f8e1ce5d065b1be53008bd79195bd93d36a1e661a0de297ac816676eae85f2

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,11 @@
 # Kitchen-Docker Changelog
 
+## 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/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.13.0"
   end
 end

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

@@ -36,6 +36,10 @@ module Kitchen
             opensuse_platform
           when 'rhel', 'centos', 'oraclelinux', 'amazonlinux', 'almalinux', 'rockylinux'
             rhel_platform
+          when 'centosstream'
+            centosstream_platform
+          when 'photon'
+            photonos_platform
           else
             raise ActionFailed, "Unknown platform '#{config[:platform]}'"
           end
@@ -114,6 +118,26 @@ 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 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 \

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

@@ -26,8 +26,8 @@ module Kitchen
 
         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]
+            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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-06-14 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.2.3
 signing_key:
 specification_version: 4
 summary: A Docker Driver for Test Kitchen