From 3f9d1ab0241d57550ee540f6c0db14149be6b149 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 12 Jun 2017 03:14:46 -0700 Subject: [PATCH] Add deps for cryptography to the Docker images (#25580) --- test/utils/docker/centos6/Dockerfile | 5 ++++- test/utils/docker/centos7/Dockerfile | 5 +++++ test/utils/docker/fedora24/Dockerfile | 5 +++++ test/utils/docker/fedora25/Dockerfile | 3 +++ test/utils/docker/opensuse42.1/Dockerfile | 2 ++ test/utils/docker/opensuse42.2/Dockerfile | 1 + test/utils/docker/ubuntu1204/Dockerfile | 5 +++-- test/utils/docker/ubuntu1404/Dockerfile | 2 ++ test/utils/docker/ubuntu1604/Dockerfile | 2 ++ test/utils/docker/ubuntu1604py3/Dockerfile | 2 ++ 10 files changed, 29 insertions(+), 3 deletions(-) diff --git a/test/utils/docker/centos6/Dockerfile b/test/utils/docker/centos6/Dockerfile index 04f555675ba..6b754ac589e 100644 --- a/test/utils/docker/centos6/Dockerfile +++ b/test/utils/docker/centos6/Dockerfile @@ -9,6 +9,8 @@ RUN yum clean all && \ file \ gcc \ git \ + libffi \ + libffi-devel \ make \ mercurial \ mysql \ @@ -16,6 +18,7 @@ RUN yum clean all && \ mysql-server \ openssh-clients \ openssh-server \ + openssl-devel \ python-coverage \ python-devel \ python-httplib2 \ @@ -41,7 +44,7 @@ RUN yum clean all && \ && \ yum clean all -RUN rpm -e --nodeps python-crypto && pip install --upgrade pycrypto +RUN rpm -e --nodeps python-crypto && pip install --upgrade pycrypto cryptography RUN /bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN mkdir /etc/ansible/ diff --git a/test/utils/docker/centos7/Dockerfile b/test/utils/docker/centos7/Dockerfile index b2d8a1dee35..922da6eeb37 100644 --- a/test/utils/docker/centos7/Dockerfile +++ b/test/utils/docker/centos7/Dockerfile @@ -17,15 +17,20 @@ RUN yum clean all && \ bzip2 \ dbus-python \ file \ + gcc \ git \ iproute \ + libffi \ + libffi-devel \ make \ mariadb-server \ mercurial \ MySQL-python \ openssh-clients \ openssh-server \ + openssl-devel \ python-coverage \ + python-devel \ python-httplib2 \ python-jinja2 \ python-keyczar \ diff --git a/test/utils/docker/fedora24/Dockerfile b/test/utils/docker/fedora24/Dockerfile index ddf94e7a7c9..82306f3d714 100644 --- a/test/utils/docker/fedora24/Dockerfile +++ b/test/utils/docker/fedora24/Dockerfile @@ -21,18 +21,23 @@ RUN dnf clean all && \ dbus-python \ file \ findutils \ + gcc \ git \ glibc-locale-source \ iproute \ + libffi \ + libffi-devel \ make \ mariadb-server \ mercurial \ MySQL-python \ openssh-clients \ openssh-server \ + openssl-devel \ procps \ python2-dnf \ python-coverage \ + python-devel \ python-httplib2 \ python-jinja2 \ python-keyczar \ diff --git a/test/utils/docker/fedora25/Dockerfile b/test/utils/docker/fedora25/Dockerfile index 92b0544385d..dd83ff56feb 100644 --- a/test/utils/docker/fedora25/Dockerfile +++ b/test/utils/docker/fedora25/Dockerfile @@ -20,12 +20,15 @@ RUN dnf clean all && \ git \ glibc-locale-source \ iproute \ + libffi \ + libffi-devel \ make \ mariadb-server \ mercurial \ MySQL-python \ openssh-clients \ openssh-server \ + openssl-devel \ procps \ python2-dnf \ python-coverage \ diff --git a/test/utils/docker/opensuse42.1/Dockerfile b/test/utils/docker/opensuse42.1/Dockerfile index cf12ed9f277..82fe949711d 100644 --- a/test/utils/docker/opensuse42.1/Dockerfile +++ b/test/utils/docker/opensuse42.1/Dockerfile @@ -21,6 +21,8 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \ openssh \ postgresql-server \ python-coverage \ + python-cryptography \ + python-devel \ python-httplib2 \ python-jinja2 \ python-keyczar \ diff --git a/test/utils/docker/opensuse42.2/Dockerfile b/test/utils/docker/opensuse42.2/Dockerfile index 1d826ceaff5..14784c0500b 100644 --- a/test/utils/docker/opensuse42.2/Dockerfile +++ b/test/utils/docker/opensuse42.2/Dockerfile @@ -21,6 +21,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \ openssh \ postgresql-server \ python-coverage \ + python-cryptography \ python-httplib2 \ python-jinja2 \ python-keyczar \ diff --git a/test/utils/docker/ubuntu1204/Dockerfile b/test/utils/docker/ubuntu1204/Dockerfile index 1296e688f9a..706940a7f98 100644 --- a/test/utils/docker/ubuntu1204/Dockerfile +++ b/test/utils/docker/ubuntu1204/Dockerfile @@ -17,6 +17,8 @@ RUN apt-get update -y && \ gawk \ gcc \ git \ + libffi-dev \ + libssl-dev \ libxml2-utils \ locales \ make \ @@ -52,8 +54,7 @@ RUN apt-get update -y && \ && \ apt-get clean -RUN pip install --upgrade pycrypto - +RUN pip install --upgrade pycrypto cryptography # helpful things taken from the ubuntu-upstart Dockerfile: # https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile ADD init-fake.conf /etc/init/fake-container-events.conf diff --git a/test/utils/docker/ubuntu1404/Dockerfile b/test/utils/docker/ubuntu1404/Dockerfile index cbf6a19325b..5db28ee7f61 100644 --- a/test/utils/docker/ubuntu1404/Dockerfile +++ b/test/utils/docker/ubuntu1404/Dockerfile @@ -16,6 +16,8 @@ RUN apt-get update -y && \ fakeroot \ gawk \ git \ + libffi-dev \ + libssl-dev \ libxml2-utils \ locales \ make \ diff --git a/test/utils/docker/ubuntu1604/Dockerfile b/test/utils/docker/ubuntu1604/Dockerfile index 101cbdaab94..e7e1ebd6ef9 100644 --- a/test/utils/docker/ubuntu1604/Dockerfile +++ b/test/utils/docker/ubuntu1604/Dockerfile @@ -17,6 +17,8 @@ RUN apt-get update -y && \ gawk \ git \ iproute2 \ + libffi-dev \ + libssl-dev \ libxml2-utils \ locales \ lsb-release \ diff --git a/test/utils/docker/ubuntu1604py3/Dockerfile b/test/utils/docker/ubuntu1604py3/Dockerfile index 2e9d46d4e0e..bdab631ca75 100644 --- a/test/utils/docker/ubuntu1604py3/Dockerfile +++ b/test/utils/docker/ubuntu1604py3/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get update -y && \ gawk \ git \ iproute2 \ + libffi-dev \ + libssl-dev \ libxml2-utils \ locales \ lsb-release \