beaker-docker 2.4.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f0bbe394205e745cae22a3fdc5b7fbbfc8c1d249a66c0643965be119889e74
-  data.tar.gz: 74fcee3180ea629537014d1c584fe7d3823819533a8e0a6ff713dc1414bd8779
+  metadata.gz: 663845682645f35c699e62cb65407975264952a259b7f80c962130d63750ec5c
+  data.tar.gz: d841fc687d1e0b2478d0145aea14149595b37c015b048fb4e6f4eb7f41e70f21
 SHA512:
-  metadata.gz: d960dca1afe2a89bf8bec6d87c739ca7d0b5cf5def2c9f9c454e6fe47d2cb59b428d2bc89c622932c65218826318fa3e8595bcea51415bfb3c57f064e00be151
-  data.tar.gz: d2f9001431ded7693d1147ad6f7de4662dab404e826dd234e0947296ddc6617f588ce5a9980e9887c3ecb1394fa4d045328b1c8480ac74e2bb603d97212f63c5
+  metadata.gz: 8fe5794c4c016d120c4ea55f2ee9ae6371be415664a727e1e48bebd61ffe7f79fed7563b15c694b77151e890c056273cd1d1ec1003191bfe1094c91ba5676616
+  data.tar.gz: 1f39d9e2c41d9eb34188cef8ca0942478f1cf7fbf32404d7f25e6461cdfadc21dba7d110288458dfd2d5fe1615a084643c9b846b57332b5f27f131677573f64e

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [2.5.1](https://github.com/voxpupuli/beaker-docker/tree/2.5.1) (2024-11-20)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.5.0...2.5.1)
+
+**Fixed bugs:**
+
+- Update sshd configuration \(UsePAM no, sshd\_config.d\) [\#148](https://github.com/voxpupuli/beaker-docker/pull/148) ([jay7x](https://github.com/jay7x))
+
+## [2.5.0](https://github.com/voxpupuli/beaker-docker/tree/2.5.0) (2024-09-20)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.4.0...2.5.0)
+
+**Implemented enhancements:**
+
+- add ContainerDocker and ContainerSwarm [\#145](https://github.com/voxpupuli/beaker-docker/pull/145) ([evgeni](https://github.com/evgeni))
+- Add ContainerPodman class [\#130](https://github.com/voxpupuli/beaker-docker/pull/130) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- fix tests after Beaker::Platform refactoring [\#146](https://github.com/voxpupuli/beaker-docker/pull/146) ([evgeni](https://github.com/evgeni))
+
 ## [2.4.0](https://github.com/voxpupuli/beaker-docker/tree/2.4.0) (2024-08-13)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.3.1...2.4.0)

data/lib/beaker/hypervisor/container.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'beaker/hypervisor/docker'
+
+module Beaker
+  class Container < Beaker::Docker
+  end
+end

data/lib/beaker/hypervisor/container_docker.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'beaker/hypervisor/container'
+
+module Beaker
+  class ContainerDocker < Beaker::Container
+  end
+end

data/lib/beaker/hypervisor/container_podman.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'beaker/hypervisor/container'
+
+module Beaker
+  class ContainerPodman < Beaker::Container
+  end
+end

data/lib/beaker/hypervisor/container_swarm.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'beaker/hypervisor/container'
+
+module Beaker
+  class ContainerSwarm < Beaker::Container
+  end
+end

data/lib/beaker/hypervisor/docker.rb

@@ -525,7 +525,6 @@ module Beaker
         dockerfile += <<~DF
           RUN zypper -n in openssh #{additional_packages.join(' ')} \
           && ssh-keygen -A \
-          && sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config \
           && sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*
         DF
       when /archlinux/
@@ -534,7 +533,6 @@ module Beaker
           && pacman --sync --refresh --noconfirm --sysupgrade \
           && pacman --sync --noconfirm #{additional_packages.join(' ')} \
           && ssh-keygen -A \
-          && sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config \
           && systemctl enable sshd
         DF
       else
@@ -552,13 +550,15 @@ module Beaker
       # Also, disable reverse DNS lookups to prevent every. single. ssh
       # operation taking 30 seconds while the lookup times out.
       # Also unbreak users with a bunch of SSH keys loaded in their keyring.
+      # Also unbreak CentOS9 & Fedora containers on Ubuntu 24.04 host (UsePAM no)
       dockerfile += <<~DF
-        RUN sed -ri \
+        RUN find /etc/ssh/sshd_config /etc/ssh/sshd_config.d/ -type f -exec sed -ri \
         -e 's/^#?PermitRootLogin .*/PermitRootLogin yes/' \
         -e 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' \
         -e 's/^#?UseDNS .*/UseDNS no/' \
+        -e 's/^#?UsePAM .*/UsePAM no/' \
         -e 's/^#?MaxAuthTries.*/MaxAuthTries 1000/' \
-        /etc/ssh/sshd_config
+        {} \\;
       DF
 
       # Any extra commands specified for the host

data/lib/beaker-docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BeakerDocker
-  VERSION = '2.4.0'
+  VERSION = '2.5.1'
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -6,7 +6,6 @@ require 'fakefs/spec_helpers'
 module Beaker
   platforms = [
     'ubuntu-14.04-x86_64',
-    'cumulus-2.2-x86_64',
     'fedora-22-x86_64',
     'centos-7-x86_64',
     'sles-12-x86_64',
@@ -190,14 +189,14 @@ module Beaker
         end
 
         it 'accepts alpine as valid platform' do
-          host['platform'] = 'alpine-3.8-x86_64'
+          host['platform'] = Beaker::Platform.new('alpine-3.8-x86_64')
           expect(test_container).to receive(:exec).at_least(:twice)
           docker.install_ssh_components(test_container, host)
         end
 
         it 'raises an error with an unsupported platform' do
-          host['platform'] = 'boogeyman-2000-x86_64'
-          expect { docker.install_ssh_components(test_container, host) }.to raise_error(RuntimeError, /boogeyman/)
+          host['platform'] = Beaker::Platform.new('windows-11-64')
+          expect { docker.install_ssh_components(test_container, host) }.to raise_error(RuntimeError, /windows/)
         end
       end
 
@@ -632,16 +631,16 @@ module Beaker
       describe '#dockerfile_for' do
         FakeFS.deactivate!
         it 'raises on an unsupported platform' do
-          expect { docker.send(:dockerfile_for, { 'platform' => 'a_sidewalk', 'image' => 'foobar' }) }.to raise_error(/platform a_sidewalk not yet supported/)
+          expect { docker.send(:dockerfile_for, make_host('none', { 'platform' => 'solaris-11-64', 'image' => 'foobar' })) }.to raise_error(/platform solaris-11-64 not yet supported/)
         end
 
         it 'sets "ENV container docker"' do
           FakeFS.deactivate!
           platforms.each do |platform|
-            dockerfile = docker.send(:dockerfile_for, {
-                                       'platform' => platform,
-                                       'image' => 'foobar',
-                                     })
+            dockerfile = docker.send(:dockerfile_for, make_host('none', {
+                                                                  'platform' => platform,
+                                                                  'image' => 'foobar',
+                                                                }))
             expect(dockerfile).to match(/ENV container docker/)
           end
         end
@@ -649,15 +648,15 @@ module Beaker
         it 'adds docker_image_first_commands as RUN statements' do
           FakeFS.deactivate!
           platforms.each do |platform|
-            dockerfile = docker.send(:dockerfile_for, {
-                                       'platform' => platform,
-                                       'image' => 'foobar',
-                                       'docker_image_first_commands' => [
-                                         'special one',
-                                         'special two',
-                                         'special three',
-                                       ],
-                                     })
+            dockerfile = docker.send(:dockerfile_for, make_host('none', {
+                                                                  'platform' => platform,
+                                                                  'image' => 'foobar',
+                                                                  'docker_image_first_commands' => [
+                                                                    'special one',
+                                                                    'special two',
+                                                                    'special three',
+                                                                  ],
+                                                                }))
 
             expect(dockerfile).to match(/RUN special one\nRUN special two\nRUN special three/)
           end
@@ -666,15 +665,15 @@ module Beaker
         it 'adds docker_image_commands as RUN statements' do
           FakeFS.deactivate!
           platforms.each do |platform|
-            dockerfile = docker.send(:dockerfile_for, {
-                                       'platform' => platform,
-                                       'image' => 'foobar',
-                                       'docker_image_commands' => [
-                                         'special one',
-                                         'special two',
-                                         'special three',
-                                       ],
-                                     })
+            dockerfile = docker.send(:dockerfile_for, make_host('none', {
+                                                                  'platform' => platform,
+                                                                  'image' => 'foobar',
+                                                                  'docker_image_commands' => [
+                                                                    'special one',
+                                                                    'special two',
+                                                                    'special three',
+                                                                  ],
+                                                                }))
 
             expect(dockerfile).to match(/RUN special one\nRUN special two\nRUN special three/)
           end
@@ -683,11 +682,11 @@ module Beaker
         it 'adds docker_image_entrypoint' do
           FakeFS.deactivate!
           platforms.each do |platform|
-            dockerfile = docker.send(:dockerfile_for, {
-                                       'platform' => platform,
-                                       'image' => 'foobar',
-                                       'docker_image_entrypoint' => '/bin/bash',
-                                     })
+            dockerfile = docker.send(:dockerfile_for, make_host('none', {
+                                                                  'platform' => platform,
+                                                                  'image' => 'foobar',
+                                                                  'docker_image_entrypoint' => '/bin/bash',
+                                                                }))
 
             expect(dockerfile).to match(%r{ENTRYPOINT /bin/bash})
           end
@@ -695,10 +694,10 @@ module Beaker
 
         it 'uses zypper on sles' do
           FakeFS.deactivate!
-          dockerfile = docker.send(:dockerfile_for, {
-                                     'platform' => 'sles-12-x86_64',
-                                     'image' => 'foobar',
-                                   })
+          dockerfile = docker.send(:dockerfile_for, make_host('none', {
+                                                                'platform' => Beaker::Platform.new('sles-12-x86_64'),
+                                                                'image' => 'foobar',
+                                                              }))
 
           expect(dockerfile).to match(/zypper -n in openssh/)
         end
@@ -706,10 +705,10 @@ module Beaker
         (22..39).to_a.each do |fedora_release|
           it "uses dnf on fedora #{fedora_release}" do
             FakeFS.deactivate!
-            dockerfile = docker.send(:dockerfile_for, {
-                                       'platform' => "fedora-#{fedora_release}-x86_64",
-                                       'image' => 'foobar',
-                                     })
+            dockerfile = docker.send(:dockerfile_for, make_host('none', {
+                                                                  'platform' => Beaker::Platform.new("fedora-#{fedora_release}-x86_64"),
+                                                                  'image' => 'foobar',
+                                                                }))
 
             expect(dockerfile).to match(/dnf install -y sudo/)
           end
@@ -717,14 +716,14 @@ module Beaker
 
         it 'uses pacman on archlinux' do
           FakeFS.deactivate!
-          dockerfile = docker.send(:dockerfile_for, {
-                                     'platform' => 'archlinux-current-x86_64',
-                                     'image' => 'foobar',
-                                   })
+          dockerfile = docker.send(:dockerfile_for, make_host('none', {
+                                                                'platform' => Beaker::Platform.new('archlinux-current-x86_64'),
+                                                                'image' => 'foobar',
+                                                              }))
 
           expect(dockerfile).to match(/pacman --sync --refresh --noconfirm archlinux-keyring/)
           expect(dockerfile).to match(/pacman --sync --refresh --noconfirm --sysupgrade/)
-          expect(dockerfile).to match(/pacman --sync --noconfirm curl ntp net-tools openssh/)
+          expect(dockerfile).to match(/pacman --sync --noconfirm curl net-tools openssh/)
         end
       end
 
@@ -747,21 +746,21 @@ module Beaker
         end
 
         it 'execs sshd on alpine' do
-          host['platform'] = 'alpine-3.8-x86_64'
+          host['platform'] = Beaker::Platform.new('alpine-3.8-x86_64')
           expect(test_container).to receive(:exec).with(array_including('sed'))
           expect(test_container).to receive(:exec).with(%w[/usr/sbin/sshd])
           docker.send(:fix_ssh, test_container, host)
         end
 
         it 'restarts ssh service on ubuntu' do
-          host['platform'] = 'ubuntu-20.04-x86_64'
+          host['platform'] = Beaker::Platform.new('ubuntu-20.04-x86_64')
           expect(test_container).to receive(:exec).with(array_including('sed'))
           expect(test_container).to receive(:exec).with(%w[service ssh restart])
           docker.send(:fix_ssh, test_container, host)
         end
 
         it 'restarts sshd service otherwise' do
-          host['platform'] = 'boogeyman-2000-x86_64'
+          host['platform'] = Beaker::Platform.new('centos-6-x86_64')
           expect(test_container).to receive(:exec).with(array_including('sed'))
           expect(test_container).to receive(:exec).with(%w[service sshd restart])
           docker.send(:fix_ssh, test_container, host)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -151,6 +151,10 @@ files:
 - docker.md
 - lib/beaker-docker.rb
 - lib/beaker-docker/version.rb
+- lib/beaker/hypervisor/container.rb
+- lib/beaker/hypervisor/container_docker.rb
+- lib/beaker/hypervisor/container_podman.rb
+- lib/beaker/hypervisor/container_swarm.rb
 - lib/beaker/hypervisor/docker.rb
 - spec/beaker/hypervisor/docker_spec.rb
 - spec/spec_helper.rb
@@ -176,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Docker hypervisor for Beaker acceptance testing framework