Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Amazon Linux 2023 #123

Merged
merged 1 commit into from
Mar 14, 2024
Merged

Support Amazon Linux 2023 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/beaker/hypervisor/docker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def install_ssh_components(container, host)
container.exec(%w[apt-get update])
container.exec(%w[apt-get install -y openssh-server openssh-client])
container.exec(%w[sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*])
when /el-[89]/, /fedora-(2[2-9]|3[0-9])/
when /el-[89]/, /fedora-(2[2-9]|3[0-9])/, /amazon-2023/
container.exec(%w[dnf clean all])
container.exec(%w[dnf install -y sudo openssh-server openssh-clients])
container.exec(%w[ssh-keygen -A])
Expand Down Expand Up @@ -509,7 +509,7 @@ def dockerfile_for(host)
RUN apt-get update \
&& apt-get install -y openssh-server openssh-client #{additional_packages.join(' ')}
DF
when /el-[89]/, /fedora-(2[2-9]|3)/
when /el-[89]/, /fedora-(2[2-9]|3)/, /amazon-2023/
dockerfile += <<~DF
RUN dnf clean all \
&& dnf install -y sudo openssh-server openssh-clients #{additional_packages.join(' ')} \
Expand Down
1 change: 1 addition & 0 deletions spec/beaker/hypervisor/docker_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module Beaker
'centos-7-x86_64',
'sles-12-x86_64',
'archlinux-2017.12.27-x86_64',
'amazon-2023-x86_64',
]

describe Docker do
Expand Down