kitchen-dokken 2.17.4 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba3482928058d00a9c89fcd9abd3d26f0e926a467dfb55e1591af7bb3b05507f
-  data.tar.gz: a1c5e556088cb04d685149d651e1853abaa90e68842fc50af3f207911eafa918
+  metadata.gz: becf7bcb14b565a4e38ef71339232b99d6cb2196918462f66007d77efcc49e62
+  data.tar.gz: e68938ec9d01a83c72456b3fd51c0af5ec0d81e9092695b11df9e487bfde8fc0
 SHA512:
-  metadata.gz: f5e8186524b8c961c739351c821e967fd620000f1082b140a3def5aea9b188bbcceebf6647600cfd649f5886814d2819c4bd9de657f3c07153a937391171187a
-  data.tar.gz: d1a7f7fcc6eb8b5ec1a4e14a46498c9dd8eaf52f9cb1a365d9748511feac7006aca933e6b684a11bcf2bd29f5c444c8f8fe352cde1745a57d2b612735fc8741a
+  metadata.gz: fbac5749ab791a90968ccfd9ff5d11667ea8d5ad9801146a451cd8fe979db215460506e4a8810bc7b2a8129213a321665f9c5fc26bc461c0135427eff6648da7
+  data.tar.gz: d26c39d6be05058de8e86ff9c10cf8576fc44ea1999f55c8bc0c1b9b6c013abcda5103233f48a788e2164ed9c5cb49928b3947674adccc26ce500998c6f96e6a

data/lib/kitchen/driver/dokken.rb

@@ -58,6 +58,7 @@ module Kitchen
       default_config :memory_limit, 0
       default_config :network_mode, "dokken"
       default_config :pid_one_command, 'sh -c "trap exit 0 SIGTERM; while :; do sleep 1; done"'
+      default_config :platform, ""
       default_config :ports, nil
       default_config :privileged, false
       default_config :pull_chef_image, true
@@ -136,28 +137,27 @@ module Kitchen
       end
 
       def delete_work_image
-        return unless ::Docker::Image.exist?(work_image, {}, docker_connection)
+        return unless ::Docker::Image.exist?(work_image, { "platform" => config[:platform] }, docker_connection)
 
-        with_retries { @work_image = ::Docker::Image.get(work_image, {}, docker_connection) }
+        with_retries { @work_image = ::Docker::Image.get(work_image, { "platform" => config[:platform] }, docker_connection) }
 
         with_retries do
-
           with_retries { @work_image.remove(force: true) }
         rescue ::Docker::Error::ConflictError
           debug "driver - #{work_image} cannot be removed"
-
         end
       end
 
       def build_work_image(state)
         info("Building work image..")
-        return if ::Docker::Image.exist?(work_image, {}, docker_connection)
+        return if ::Docker::Image.exist?(work_image, { "platform" => config[:platform] }, docker_connection)
 
         begin
           @intermediate_image = ::Docker::Image.build(
             work_image_dockerfile,
             {
               "t" => work_image,
+              "platform" => config[:platform],
             },
             docker_connection
           )
@@ -389,7 +389,7 @@ module Kitchen
         lockfile = Lockfile.new "#{home_dir}/.dokken-#{chef_container_name}.lock"
         begin
           lockfile.lock
-          with_retries {
+          with_retries do
             # TEMPORARY FIX - docker-api 2.0.0 has a buggy Docker::Container.get - use .all instead
             # https://github.com/swipely/docker-api/issues/566
             # ::Docker::Container.get(chef_container_name, {}, docker_connection)
@@ -397,7 +397,7 @@ module Kitchen
             raise ::Docker::Error::NotFoundError.new(chef_container_name) if found.empty?
 
             debug "Chef container already exists, continuing"
-          }
+          end
         rescue ::Docker::Error::NotFoundError
           debug "Chef container does not exist, creating a new Chef container"
           with_retries do
@@ -479,7 +479,7 @@ module Kitchen
       end
 
       def delete_image(name)
-        with_retries { @image = ::Docker::Image.get(name, {}, docker_connection) }
+        with_retries { @image = ::Docker::Image.get(name, { "platform" => config[:platform] }, docker_connection) }
         with_retries { @image.remove(force: true) }
       rescue ::Docker::Error
         puts "Image #{name} not found. Nothing to delete."
@@ -551,10 +551,10 @@ module Kitchen
           args["Env"] = [] if args["Env"].nil?
           args["Env"] << "TEST_KITCHEN=1"
           args["Env"] << "CI=#{ENV["CI"]}" if ENV.include? "CI"
+          args["Platform"] = config[:platform]
           info "Creating container #{args["name"]}"
           debug "driver - create_container args #{args}"
           with_retries do
-
             @container = ::Docker::Container.create(args.clone, docker_connection)
           rescue ::Docker::Error::ConflictError
             debug "driver - rescue ConflictError: #{args["name"]}"
@@ -563,7 +563,6 @@ module Kitchen
         rescue ::Docker::Error => e
           debug "driver - error :#{e}:"
           raise "driver - failed to create_container #{args["name"]}"
-
         end
       end
 
@@ -612,7 +611,7 @@ module Kitchen
       end
 
       def chef_container_name
-        "chef-#{chef_version}"
+        config[:platform] != "" ? "chef-#{chef_version}-" + config[:platform].sub("/", "-") : "chef-#{chef_version}"
       end
 
       def chef_image
@@ -643,7 +642,7 @@ module Kitchen
       end
 
       def pull_if_missing(image)
-        return if ::Docker::Image.exist?(registry_image_path(image), {}, docker_connection)
+        return if ::Docker::Image.exist?(registry_image_path(image), { "platform" => config[:platform] }, docker_connection)
 
         pull_image image
       end
@@ -656,13 +655,13 @@ module Kitchen
       def pull_image(image)
         path = registry_image_path(image)
         with_retries do
-          if Docker::Image.exist?(path, {}, docker_connection)
-            original_image = Docker::Image.get(path, {}, docker_connection)
+          if Docker::Image.exist?(path, { "platform" => config[:platform] }, docker_connection)
+            original_image = Docker::Image.get(path, { "platform" => config[:platform] }, docker_connection)
           end
 
-          new_image = Docker::Image.create({ "fromImage" => path }, docker_creds_for_image(image), docker_connection)
+          new_image = Docker::Image.create({ "fromImage" => path, "platform" => config[:platform] }, docker_creds_for_image(image), docker_connection)
 
-          !(original_image && original_image.id.start_with?(new_image.id))
+          !(original_image&.id&.start_with?(new_image.id))
         end
       end
 

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = "2.17.4".freeze
+    DOKKEN_VERSION = "2.19.0".freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -19,40 +19,40 @@ module Dokken
     end
 
     def insecure_ssh_public_key
-      <<-EOF
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCoJwyW7qNhw+NTuOjC4+RVpESl+JBXebXzB7JqxRgKAbymq6B39azEAiNx5NzHkWcQmOyQNhFpKFSAufegcXRS4ctS1LcElEoXe9brDAqKEBSkmnXYfZXMNIG0Enw4+5W/rZxHFCAlsUSAHYtYZEs+3CgbIWuHhZ95C8UC6nGLWHNZOjcbsYZFrnFfO0qg0ene2w8LKhxqj5X0MRSdCIn1IwyxIbl5NND5Yk1Hx8JKsJtTiNTdxssiMgmM5bvTbYQUSf8pbGrRI30VQKBgQ8/UkidZbaTfvzWXYpwcDUERSbzEYCvkUytTemZIv6uhpPxqkfjl6KEOOml/iGqquPEr test-kitchen-rsa
+      <<~EOF
+        ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCoJwyW7qNhw+NTuOjC4+RVpESl+JBXebXzB7JqxRgKAbymq6B39azEAiNx5NzHkWcQmOyQNhFpKFSAufegcXRS4ctS1LcElEoXe9brDAqKEBSkmnXYfZXMNIG0Enw4+5W/rZxHFCAlsUSAHYtYZEs+3CgbIWuHhZ95C8UC6nGLWHNZOjcbsYZFrnFfO0qg0ene2w8LKhxqj5X0MRSdCIn1IwyxIbl5NND5Yk1Hx8JKsJtTiNTdxssiMgmM5bvTbYQUSf8pbGrRI30VQKBgQ8/UkidZbaTfvzWXYpwcDUERSbzEYCvkUytTemZIv6uhpPxqkfjl6KEOOml/iGqquPEr test-kitchen-rsa
       EOF
     end
 
     def insecure_ssh_private_key
-      <<-EOF
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAqCcMlu6jYcPjU7jowuPkVaREpfiQV3m18weyasUYCgG8pqug
-d/WsxAIjceTcx5FnEJjskDYRaShUgLn3oHF0UuHLUtS3BJRKF3vW6wwKihAUpJp1
-2H2VzDSBtBJ8OPuVv62cRxQgJbFEgB2LWGRLPtwoGyFrh4WfeQvFAupxi1hzWTo3
-G7GGRa5xXztKoNHp3tsPCyocao+V9DEUnQiJ9SMMsSG5eTTQ+WJNR8fCSrCbU4jU
-3cbLIjIJjOW7022EFEn/KWxq0SN9FUCgYEPP1JInWW2k3781l2KcHA1BEUm8xGAr
-5FMrU3pmSL+roaT8apH45eihDjppf4hqqrjxKwIDAQABAoIBAEj7Cb/IOykHd/ay
-XnOXrVZuQU03oI4WyR19zbYBbPmK33IHM1JdUmqP8wpPpnMHbJALj0DX9p6JXoOw
-MwVzuGTwkuqUYAqgwbeHjDPfugNKD2uRjmwztXw3ncOl8jxZFRloJFfFKF6znWNt
-bzkh7naN3upHiv/6wsgqj4tAbZ9oRC1crO6bsNr3P6YooiG5RRNpHepiyXphyhN6
-We1p5ZOQ/pUSE0Ca4wTlUhJHTUPMz7VFs/8CH0loRIsGPBROarPkoLVF+/UNyX8e
-+BGMhoUtQH2XvjEzWUl5jKJOnvKRIV+0j/upWXsPQKF5glVPmPrTVUAxThfu6rAa
-4Z3JveECgYEA0Pz3Hl0SlPR79r2qofh1ZNa8zvQDL+iLopULwDiil5qlUxJ+DgOl
-1kWXLhjdg/NfoTBHvBjdJu274YJgaGQOfCy5747YDVsakKOm4bI9+Jr2agshPyE6
-f1RNmGL8K8fNtpGq4G14o+pSQOPNrEfcFKgm3sosZWJAWaA64hmtiXcCgYEAzfp6
-FbodfUypAV5Zd6PCO2eJMjLdvGaNuH/Umo80WNV7XZ6iJ6MUeQe+YwxFJigjC3ii
-ifLUj3kL7+wu7sEtkzS3zNd34KfhQ5fLADttfFgjjfm7IxlDD4ABaUgjwZM2gfXi
-xCwRhwwNgilF6qABJ1CLt8JSqKubkqvO1P1gQu0CgYEA0GA6AcNpYK344Eey1/bF
-DntyHKN+fglPGReldM7Dh4gBabgZid2nP+N5XtQaIpPKeQyLqgfckhEecTau68dA
-Dh4Gcs6pq394GFmkbotrcPMJ2SgpySlXi1fCWrvvlbON8IiDqWxdiop74wmArFOm
-I86ZmzBYXeo+IV869vAFcPcCgYBrvvyh5OuMIc++YYZXaRgvTueblLQc22CDBItI
-FmUBmxqfTF3ycgJBlWVoFoENhq1eUMplctrx+hXeeSPLzM10VX1X79ZLdEYHv513
-D58kDk7684mKwKotr34NfqkFl2ZJ8T+f8pVwmUNvtPtX0j8IO7/6bfIjPTFyNeFJ
-1QjHuQKBgQC/LE05M4eeWXihZ7c7fyWHLyddcPdH48LRF9UH9yjKF84jXRT91uMv
-XuIb2Qt4MLHABySsk653LDw/jTIGV26c068nZryq5OUPxk67Xgod54jKgOwjgjZS
-X8N2N9ZNnORJqK374yGj1jWUU66mQhPvn49QpG8P2HEoh2RQjNvyHA==
------END RSA PRIVATE KEY-----
+      <<~EOF
+        -----BEGIN RSA PRIVATE KEY-----
+        MIIEpAIBAAKCAQEAqCcMlu6jYcPjU7jowuPkVaREpfiQV3m18weyasUYCgG8pqug
+        d/WsxAIjceTcx5FnEJjskDYRaShUgLn3oHF0UuHLUtS3BJRKF3vW6wwKihAUpJp1
+        2H2VzDSBtBJ8OPuVv62cRxQgJbFEgB2LWGRLPtwoGyFrh4WfeQvFAupxi1hzWTo3
+        G7GGRa5xXztKoNHp3tsPCyocao+V9DEUnQiJ9SMMsSG5eTTQ+WJNR8fCSrCbU4jU
+        3cbLIjIJjOW7022EFEn/KWxq0SN9FUCgYEPP1JInWW2k3781l2KcHA1BEUm8xGAr
+        5FMrU3pmSL+roaT8apH45eihDjppf4hqqrjxKwIDAQABAoIBAEj7Cb/IOykHd/ay
+        XnOXrVZuQU03oI4WyR19zbYBbPmK33IHM1JdUmqP8wpPpnMHbJALj0DX9p6JXoOw
+        MwVzuGTwkuqUYAqgwbeHjDPfugNKD2uRjmwztXw3ncOl8jxZFRloJFfFKF6znWNt
+        bzkh7naN3upHiv/6wsgqj4tAbZ9oRC1crO6bsNr3P6YooiG5RRNpHepiyXphyhN6
+        We1p5ZOQ/pUSE0Ca4wTlUhJHTUPMz7VFs/8CH0loRIsGPBROarPkoLVF+/UNyX8e
+        +BGMhoUtQH2XvjEzWUl5jKJOnvKRIV+0j/upWXsPQKF5glVPmPrTVUAxThfu6rAa
+        4Z3JveECgYEA0Pz3Hl0SlPR79r2qofh1ZNa8zvQDL+iLopULwDiil5qlUxJ+DgOl
+        1kWXLhjdg/NfoTBHvBjdJu274YJgaGQOfCy5747YDVsakKOm4bI9+Jr2agshPyE6
+        f1RNmGL8K8fNtpGq4G14o+pSQOPNrEfcFKgm3sosZWJAWaA64hmtiXcCgYEAzfp6
+        FbodfUypAV5Zd6PCO2eJMjLdvGaNuH/Umo80WNV7XZ6iJ6MUeQe+YwxFJigjC3ii
+        ifLUj3kL7+wu7sEtkzS3zNd34KfhQ5fLADttfFgjjfm7IxlDD4ABaUgjwZM2gfXi
+        xCwRhwwNgilF6qABJ1CLt8JSqKubkqvO1P1gQu0CgYEA0GA6AcNpYK344Eey1/bF
+        DntyHKN+fglPGReldM7Dh4gBabgZid2nP+N5XtQaIpPKeQyLqgfckhEecTau68dA
+        Dh4Gcs6pq394GFmkbotrcPMJ2SgpySlXi1fCWrvvlbON8IiDqWxdiop74wmArFOm
+        I86ZmzBYXeo+IV869vAFcPcCgYBrvvyh5OuMIc++YYZXaRgvTueblLQc22CDBItI
+        FmUBmxqfTF3ycgJBlWVoFoENhq1eUMplctrx+hXeeSPLzM10VX1X79ZLdEYHv513
+        D58kDk7684mKwKotr34NfqkFl2ZJ8T+f8pVwmUNvtPtX0j8IO7/6bfIjPTFyNeFJ
+        1QjHuQKBgQC/LE05M4eeWXihZ7c7fyWHLyddcPdH48LRF9UH9yjKF84jXRT91uMv
+        XuIb2Qt4MLHABySsk653LDw/jTIGV26c068nZryq5OUPxk67Xgod54jKgOwjgjZS
+        X8N2N9ZNnORJqK374yGj1jWUU66mQhPvn49QpG8P2HEoh2RQjNvyHA==
+        -----END RSA PRIVATE KEY-----
       EOF
     end
 
@@ -61,29 +61,29 @@ X8N2N9ZNnORJqK374yGj1jWUU66mQhPvn49QpG8P2HEoh2RQjNvyHA==
       if registry
         from = "#{registry}/#{from}"
       end
-      <<-EOF
-FROM #{from}
-MAINTAINER Sean OMeara \"sean@sean.io\"
-ENV LANG en_US.UTF-8
+      <<~EOF
+        FROM #{from}
+        MAINTAINER Sean OMeara "sean@sean.io"
+        ENV LANG en_US.UTF-8
 
-RUN yum -y install tar rsync openssh-server passwd git
-RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+        RUN yum -y install tar rsync openssh-server passwd git
+        RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
 
-# uncomment to debug cert issues
-# RUN echo 'root:dokkendokkendokken' | chpasswd
-# RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-# RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
+        # uncomment to debug cert issues
+        # RUN echo 'root:dokkendokkendokken' | chpasswd
+        # RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+        # RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
 
-RUN mkdir -p /root/.ssh/
-COPY authorized_keys /root/.ssh/authorized_keys
-RUN chmod 700 /root/.ssh/
-RUN chmod 600  /root/.ssh/authorized_keys
+        RUN mkdir -p /root/.ssh/
+        COPY authorized_keys /root/.ssh/authorized_keys
+        RUN chmod 700 /root/.ssh/
+        RUN chmod 600  /root/.ssh/authorized_keys
 
-EXPOSE 22
-CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "UsePrivilegeSeparation=no", "-o", "MaxAuthTries=60" ]
+        EXPOSE 22
+        CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "UsePrivilegeSeparation=no", "-o", "MaxAuthTries=60" ]
 
-VOLUME /opt/kitchen
-VOLUME /opt/verifier
+        VOLUME /opt/kitchen
+        VOLUME /opt/verifier
       EOF
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.17.4
+  version: 2.19.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2022-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -78,7 +78,7 @@ files:
 - lib/kitchen/helpers.rb
 - lib/kitchen/provisioner/dokken.rb
 - lib/kitchen/transport/dokken.rb
-homepage: https://github.com/someara/kitchen-dokken
+homepage: https://github.com/test-kitchen/kitchen-dokken
 licenses:
 - Apache-2.0
 metadata: {}
@@ -90,14 +90,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing