Skip to content

Commit 341e7e1

Browse files
Merge pull request #261 from h0tw1r3/dnf-support
fix provision on dnf only platforms
2 parents 9435bc4 + 45853f7 commit 341e7e1

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

tasks/docker.rb

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ def install_ssh_components(distro, version, container)
1515
docker_exec(container, 'rm -f /etc/apt/sources.list.d/ubuntu-esm-infra-trusty.list')
1616
docker_exec(container, 'apt-get update')
1717
docker_exec(container, 'apt-get install -y openssh-server openssh-client')
18-
when %r{fedora}
19-
docker_exec(container, 'dnf clean all')
20-
docker_exec(container, 'dnf install -y sudo openssh-server openssh-clients')
21-
docker_exec(container, 'ssh-keygen -A')
22-
when %r{centos}, %r{^el-}, %r{eos}, %r{oracle}, %r{ol}, %r{rhel|redhat}, %r{scientific}, %r{amzn}, %r{rocky}, %r{almalinux}
18+
when %r{centos}, %r{^el-}, %r{eos}, %r{oracle}, %r{ol}, %r{rhel|redhat}, %r{scientific}, %r{amzn}, %r{rocky}, %r{almalinux}, %r{fedora}
2319
if version == '6'
2420
# sometimes the redhat 6 variant containers like to eat their rpmdb, leading to
2521
# issues with "rpmdb: unable to join the environment" errors
@@ -35,7 +31,8 @@ def install_ssh_components(distro, version, container)
3531
'do sleep 0.1 ; count=$((count+1)) ; done ; fi'
3632
docker_exec(container, "bash -c '#{check_init_cmd}'")
3733
end
38-
docker_exec(container, 'yum install -y sudo openssh-server openssh-clients')
34+
packager = (version.to_i > 8) ? 'dnf' : 'yum'
35+
docker_exec(container, "#{packager} install -y sudo openssh-server openssh-clients")
3936
ssh_folder = docker_exec(container, 'ls /etc/ssh/')
4037
docker_exec(container, 'ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ""') unless ssh_folder.include?('ssh_host_rsa_key')
4138
docker_exec(container, 'ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ""') unless ssh_folder.include?('ssh_host_dsa_key')

0 commit comments

Comments
 (0)