kitchen-docker 2.13.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b1291ba7bef7b5a17771a1187a34829acac0b0a78e4185119ecb0e5e23728da
-  data.tar.gz: f1f3b39dc87295717756beab914c0ea5d945c68e318f581717e55b6a65ffbaea
+  metadata.gz: 2a90dcbcb9d7867d3600976b04316ebc8bb26edc05c67913a539748bac45c52a
+  data.tar.gz: 582e8c53e995ec7d772a8d8580f582edbbff4a64648fc4e5ac41d657c40a2a59
 SHA512:
-  metadata.gz: f6bcc821a798f066815e2b9da4ef82389b29e53da4dd66bfbb0a228cb2a9b185289621f496d60bea06c5fb54aab388201f4f0c287e4743d2bd809bce4ed264ff
-  data.tar.gz: 6bdc6f960565040e5f8161dd6f64d81059fb9d83c42bf71287cf95c6e31ab50056f8e1ce5d065b1be53008bd79195bd93d36a1e661a0de297ac816676eae85f2
+  metadata.gz: 121b7a903fe8748c082b9746ed47df1a159652345f1a2e0c26aef04cf1f07e6c69b82b18fa3ab49ed17b93bddfbae69f32bb3839ccb41d3f8ffde9654bf574df
+  data.tar.gz: be747b9b96ea67b8848f25ad77d68edf5272201daafeb3f5f93902ceac7e2899322db2ebd5bed75682a81dafa4e85642d2872efb7ad4a9f9479f8cfe2f1de627

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Kitchen-Docker Changelog
 
+Future CHANGELOG notes will be in GitHub release notes
+
+## 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)

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.13.0"
+    DOCKER_VERSION = "2.15.0"
   end
 end

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

@@ -34,10 +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'
             rhel_platform
           when 'centosstream'
             centosstream_platform
+          when 'almalinux'
+            almalinux_platform
+          when 'rockylinux'
+            rockylinux_platform
           when 'photon'
             photonos_platform
           else
@@ -103,7 +107,7 @@ module Kitchen
         def opensuse_platform
           <<-CODE
             ENV container docker
-            RUN zypper install -y sudo openssh which curl
+            RUN zypper install -y sudo openssh which curl gawk
             RUN /usr/sbin/sshd-gen-keys-start
           CODE
         end
@@ -128,6 +132,26 @@ module Kitchen
           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 rockylinux_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
@@ -143,6 +167,8 @@ module Kitchen
             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,7 +26,7 @@ module Kitchen
         include Kitchen::Docker::Helpers::ContainerHelper
 
         def parse_image_id(output)
-          output.each_line do |line|
+          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
@@ -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.13.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2023-11-15 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.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A Docker Driver for Test Kitchen