From da99e4e0aa151a45457047fe4a5770aafa4add19 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Sat, 19 Mar 2016 11:42:23 -0700 Subject: [PATCH] Add ssh client and server to docker containers. This will allow for future integration tests using ssh to localhost from within docker containers running on Travis. --- test/utils/docker/centos6/Dockerfile | 8 ++++++++ test/utils/docker/centos7/Dockerfile | 8 ++++++++ test/utils/docker/fedora-rawhide/Dockerfile | 7 +++++++ test/utils/docker/fedora23/Dockerfile | 7 +++++++ test/utils/docker/ubuntu1204/Dockerfile | 5 +++++ test/utils/docker/ubuntu1404/Dockerfile | 5 +++++ 6 files changed, 40 insertions(+) diff --git a/test/utils/docker/centos6/Dockerfile b/test/utils/docker/centos6/Dockerfile index ebca54ae65f..d0ffed83c06 100644 --- a/test/utils/docker/centos6/Dockerfile +++ b/test/utils/docker/centos6/Dockerfile @@ -13,6 +13,8 @@ RUN yum -y install \ subversion \ sudo \ unzip \ + openssh-clients \ + openssh-server \ which RUN yum -y install \ PyYAML \ @@ -33,5 +35,11 @@ RUN /bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN mkdir /etc/ansible/ RUN /bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts #VOLUME /sys/fs/cgroup /run /tmp +RUN ssh-keygen -q -t rsa1 -N '' -f /etc/ssh/ssh_host_key +RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key +RUN ssh-keygen -q -t rsa -N '' -f /etc/ssh/ssh_host_rsa_key +RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa +RUN cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys +RUN for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done ENV container=docker CMD ["/sbin/init"] diff --git a/test/utils/docker/centos7/Dockerfile b/test/utils/docker/centos7/Dockerfile index 6e4f93dcaf7..1114c8adb99 100644 --- a/test/utils/docker/centos7/Dockerfile +++ b/test/utils/docker/centos7/Dockerfile @@ -21,6 +21,8 @@ RUN yum -y install \ subversion \ sudo \ unzip \ + openssh-clients \ + openssh-server \ which RUN yum -y install \ PyYAML \ @@ -38,5 +40,11 @@ RUN /usr/bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN mkdir /etc/ansible/ RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts VOLUME /sys/fs/cgroup /run /tmp +RUN ssh-keygen -q -t rsa1 -N '' -f /etc/ssh/ssh_host_key +RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key +RUN ssh-keygen -q -t rsa -N '' -f /etc/ssh/ssh_host_rsa_key +RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa +RUN cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys +RUN for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done ENV container=docker CMD ["/usr/sbin/init"] diff --git a/test/utils/docker/fedora-rawhide/Dockerfile b/test/utils/docker/fedora-rawhide/Dockerfile index e587177607a..14c77dac3db 100644 --- a/test/utils/docker/fedora-rawhide/Dockerfile +++ b/test/utils/docker/fedora-rawhide/Dockerfile @@ -37,11 +37,18 @@ RUN dnf -y install \ tar \ unzip \ which \ + openssh-clients \ + openssh-server \ yum RUN localedef --quiet -c -i en_US -f UTF-8 en_US.UTF-8 RUN /usr/bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN mkdir /etc/ansible/ RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts VOLUME /sys/fs/cgroup /run /tmp +RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key +RUN ssh-keygen -q -t rsa -N '' -f /etc/ssh/ssh_host_rsa_key +RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa +RUN cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys +RUN for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done ENV container=docker CMD ["/usr/sbin/init"] diff --git a/test/utils/docker/fedora23/Dockerfile b/test/utils/docker/fedora23/Dockerfile index d382794359a..1dcb12a254a 100644 --- a/test/utils/docker/fedora23/Dockerfile +++ b/test/utils/docker/fedora23/Dockerfile @@ -37,6 +37,8 @@ RUN dnf -y install \ tar \ unzip \ which \ + openssh-clients \ + openssh-server \ yum RUN localedef --quiet -f ISO-8859-1 -i pt_BR pt_BR RUN localedef --quiet -f ISO-8859-1 -i es_MX es_MX @@ -44,5 +46,10 @@ RUN /usr/bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN mkdir /etc/ansible/ RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts VOLUME /sys/fs/cgroup /run /tmp +RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key +RUN ssh-keygen -q -t rsa -N '' -f /etc/ssh/ssh_host_rsa_key +RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa +RUN cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys +RUN for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done ENV container=docker CMD ["/usr/sbin/init"] diff --git a/test/utils/docker/ubuntu1204/Dockerfile b/test/utils/docker/ubuntu1204/Dockerfile index 347f9116136..f32181e5925 100644 --- a/test/utils/docker/ubuntu1204/Dockerfile +++ b/test/utils/docker/ubuntu1204/Dockerfile @@ -11,6 +11,8 @@ RUN apt-get install -y \ rubygems \ subversion \ sudo \ + openssh-client \ + openssh-server \ unzip # helpful things taken from the ubuntu-upstart Dockerfile: @@ -60,5 +62,8 @@ RUN /bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN mkdir /etc/ansible/ RUN /bin/echo -e "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts RUN locale-gen en_US.UTF-8 +RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa +RUN cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys +RUN for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done ENV container docker CMD ["/sbin/init"] diff --git a/test/utils/docker/ubuntu1404/Dockerfile b/test/utils/docker/ubuntu1404/Dockerfile index 25493c1f86e..521e1b664dc 100644 --- a/test/utils/docker/ubuntu1404/Dockerfile +++ b/test/utils/docker/ubuntu1404/Dockerfile @@ -10,6 +10,8 @@ RUN apt-get install -y \ ruby \ subversion \ sudo \ + openssh-client \ + openssh-server \ unzip # helpful things taken from the ubuntu-upstart Dockerfile: @@ -57,5 +59,8 @@ RUN /bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN mkdir /etc/ansible/ RUN /bin/echo -e "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts RUN locale-gen en_US.UTF-8 +RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa +RUN cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys +RUN for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done ENV container docker CMD ["/sbin/init"]