@@ -15,11 +15,7 @@ def install_ssh_components(distro, version, container)
15
15
docker_exec ( container , 'rm -f /etc/apt/sources.list.d/ubuntu-esm-infra-trusty.list' )
16
16
docker_exec ( container , 'apt-get update' )
17
17
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}
23
19
if version == '6'
24
20
# sometimes the redhat 6 variant containers like to eat their rpmdb, leading to
25
21
# issues with "rpmdb: unable to join the environment" errors
@@ -35,7 +31,8 @@ def install_ssh_components(distro, version, container)
35
31
'do sleep 0.1 ; count=$((count+1)) ; done ; fi'
36
32
docker_exec ( container , "bash -c '#{ check_init_cmd } '" )
37
33
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" )
39
36
ssh_folder = docker_exec ( container , 'ls /etc/ssh/' )
40
37
docker_exec ( container , 'ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ""' ) unless ssh_folder . include? ( 'ssh_host_rsa_key' )
41
38
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