beaker-docker 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b71f56e85f3587c0e5a206f50e0076dc720ee1439190ff174106433042702df
-  data.tar.gz: 6ecc500404ea4ffb79d4e25ad3eaea8dab76dbba20551eae2f48872c638ed44c
+  metadata.gz: 663845682645f35c699e62cb65407975264952a259b7f80c962130d63750ec5c
+  data.tar.gz: d841fc687d1e0b2478d0145aea14149595b37c015b048fb4e6f4eb7f41e70f21
 SHA512:
-  metadata.gz: c3382b63801a0a3ecaa409337ac240e8b9565892120a2e62285a7436047fae856384476b6d9427cf4ebbbe96b7470bec360d42d6cb765cffcbefe1adce210821
-  data.tar.gz: a70861121d80a3e16b1abadf7b03ef1925a04ad8d87c6dfe71abd8e19e0e335ab44ebc16f8c24fba2d2ec483dcbea7681ffcfb303b67a0aca4f0ab717b7390a7
+  metadata.gz: 8fe5794c4c016d120c4ea55f2ee9ae6371be415664a727e1e48bebd61ffe7f79fed7563b15c694b77151e890c056273cd1d1ec1003191bfe1094c91ba5676616
+  data.tar.gz: 1f39d9e2c41d9eb34188cef8ca0942478f1cf7fbf32404d7f25e6461cdfadc21dba7d110288458dfd2d5fe1615a084643c9b846b57332b5f27f131677573f64e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 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)

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.5.0'
+  VERSION = '2.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-20 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Docker hypervisor for Beaker acceptance testing framework