From e126b7005475bd4e4a8508be4a43a1e9287b2163 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 27 Jan 2022 18:07:37 +0100
Subject: [PATCH] Use host_packages helper to reuse logic from beaker

This new method determines the packages to install while taking the host
into account. This means docker and non-docker follow the same logic.
---
 beaker-docker.gemspec           |  3 +--
 lib/beaker/hypervisor/docker.rb | 13 +++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/beaker-docker.gemspec b/beaker-docker.gemspec
index 0bbf3bd..4e73403 100644
--- a/beaker-docker.gemspec
+++ b/beaker-docker.gemspec
@@ -31,6 +31,5 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'docker-api', '~> 2.1'
-
+  s.add_runtime_dependency 'beaker', '>= 4.34'
 end
-
diff --git a/lib/beaker/hypervisor/docker.rb b/lib/beaker/hypervisor/docker.rb
index 938375b..c1ee9da 100644
--- a/lib/beaker/hypervisor/docker.rb
+++ b/lib/beaker/hypervisor/docker.rb
@@ -522,23 +522,24 @@ def dockerfile_for(host)
 
       # add platform-specific actions
       service_name = "sshd"
+      additional_packages = host_packages(host)
       case host['platform']
       when /ubuntu/, /debian/
         service_name = "ssh"
         dockerfile += <<~EOF
           RUN apt-get update
-          RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
+          RUN apt-get install -y openssh-server openssh-client #{additional_packages.join(' ')}
           RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*
           EOF
       when  /cumulus/
           dockerfile += <<~EOF
           RUN apt-get update
-          RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
+          RUN apt-get install -y openssh-server openssh-client #{additional_packages.join(' ')}
           EOF
       when /el-[89]/, /fedora-(2[2-9]|3)/
         dockerfile += <<~EOF
           RUN dnf clean all
-          RUN dnf install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::RHEL8_PACKAGES.join(' ')}
+          RUN dnf install -y sudo openssh-server openssh-clients #{additional_packages.join(' ')}
           RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
           RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
           RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*
@@ -546,14 +547,14 @@ def dockerfile_for(host)
       when /^el-/, /centos/, /fedora/, /redhat/, /eos/
         dockerfile += <<~EOF
           RUN yum clean all
-          RUN yum install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
+          RUN yum install -y sudo openssh-server openssh-clients #{additional_packages.join(' ')}
           RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
           RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
           RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*
           EOF
       when /opensuse/, /sles/
         dockerfile += <<~EOF
-          RUN zypper -n in openssh #{Beaker::HostPrebuiltSteps::SLES_PACKAGES.join(' ')}
+          RUN zypper -n in openssh #{additional_packages.join(' ')}
           RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
           RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
           RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
@@ -563,7 +564,7 @@ def dockerfile_for(host)
         dockerfile += <<~EOF
           RUN pacman --noconfirm -Sy archlinux-keyring
           RUN pacman --noconfirm -Syu
-          RUN pacman -S --noconfirm openssh #{Beaker::HostPrebuiltSteps::ARCHLINUX_PACKAGES.join(' ')}
+          RUN pacman -S --noconfirm openssh #{additional_packages.join(' ')}
           RUN ssh-keygen -A
           RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
           RUN systemctl enable sshd