Skip to content

Commit 350a698

Browse files
authored
Merge pull request #253 from armab/fix/ssh-keygen-overwrite
Fix ssh_host key generation failure if file already exists
2 parents b2b44ba + 4e832b9 commit 350a698

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

lib/kitchen/driver/docker.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ def build_dockerfile
217217
ENV container docker
218218
RUN yum clean all
219219
RUN yum install -y sudo openssh-server openssh-clients which curl
220-
RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
221-
RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
220+
RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
221+
RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
222222
eos
223223
when 'arch'
224224
# See https://bugs.archlinux.org/task/47052 for why we
@@ -227,23 +227,23 @@ def build_dockerfile
227227
RUN pacman --noconfirm -Sy archlinux-keyring
228228
RUN pacman-db-upgrade
229229
RUN pacman --noconfirm -Sy openssl openssh sudo curl
230-
RUN ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
231-
RUN ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
230+
RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
231+
RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
232232
RUN echo >/etc/security/limits.conf
233233
eos
234234
when 'gentoo'
235235
<<-eos
236236
RUN emerge --sync
237237
RUN emerge net-misc/openssh app-admin/sudo
238-
RUN ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
239-
RUN ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
238+
RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
239+
RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
240240
eos
241241
when 'gentoo-paludis'
242242
<<-eos
243243
RUN cave sync
244244
RUN cave resolve -zx net-misc/openssh app-admin/sudo
245-
RUN ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
246-
RUN ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
245+
RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
246+
RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
247247
eos
248248
else
249249
raise ActionFailed,

0 commit comments

Comments
 (0)