Add deps for cryptography to the Docker images (#25580)

This commit is contained in:
Toshio Kuratomi 2017-06-12 03:14:46 -07:00 committed by John R Barker
parent b89cb95609
commit 3f9d1ab024
10 changed files with 29 additions and 3 deletions

View file

@ -9,6 +9,8 @@ RUN yum clean all && \
file \ file \
gcc \ gcc \
git \ git \
libffi \
libffi-devel \
make \ make \
mercurial \ mercurial \
mysql \ mysql \
@ -16,6 +18,7 @@ RUN yum clean all && \
mysql-server \ mysql-server \
openssh-clients \ openssh-clients \
openssh-server \ openssh-server \
openssl-devel \
python-coverage \ python-coverage \
python-devel \ python-devel \
python-httplib2 \ python-httplib2 \
@ -41,7 +44,7 @@ RUN yum clean all && \
&& \ && \
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 /bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
RUN mkdir /etc/ansible/ RUN mkdir /etc/ansible/

View file

@ -17,15 +17,20 @@ RUN yum clean all && \
bzip2 \ bzip2 \
dbus-python \ dbus-python \
file \ file \
gcc \
git \ git \
iproute \ iproute \
libffi \
libffi-devel \
make \ make \
mariadb-server \ mariadb-server \
mercurial \ mercurial \
MySQL-python \ MySQL-python \
openssh-clients \ openssh-clients \
openssh-server \ openssh-server \
openssl-devel \
python-coverage \ python-coverage \
python-devel \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
python-keyczar \ python-keyczar \

View file

@ -21,18 +21,23 @@ RUN dnf clean all && \
dbus-python \ dbus-python \
file \ file \
findutils \ findutils \
gcc \
git \ git \
glibc-locale-source \ glibc-locale-source \
iproute \ iproute \
libffi \
libffi-devel \
make \ make \
mariadb-server \ mariadb-server \
mercurial \ mercurial \
MySQL-python \ MySQL-python \
openssh-clients \ openssh-clients \
openssh-server \ openssh-server \
openssl-devel \
procps \ procps \
python2-dnf \ python2-dnf \
python-coverage \ python-coverage \
python-devel \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
python-keyczar \ python-keyczar \

View file

@ -20,12 +20,15 @@ RUN dnf clean all && \
git \ git \
glibc-locale-source \ glibc-locale-source \
iproute \ iproute \
libffi \
libffi-devel \
make \ make \
mariadb-server \ mariadb-server \
mercurial \ mercurial \
MySQL-python \ MySQL-python \
openssh-clients \ openssh-clients \
openssh-server \ openssh-server \
openssl-devel \
procps \ procps \
python2-dnf \ python2-dnf \
python-coverage \ python-coverage \

View file

@ -21,6 +21,8 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
openssh \ openssh \
postgresql-server \ postgresql-server \
python-coverage \ python-coverage \
python-cryptography \
python-devel \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
python-keyczar \ python-keyczar \

View file

@ -21,6 +21,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
openssh \ openssh \
postgresql-server \ postgresql-server \
python-coverage \ python-coverage \
python-cryptography \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
python-keyczar \ python-keyczar \

View file

@ -17,6 +17,8 @@ RUN apt-get update -y && \
gawk \ gawk \
gcc \ gcc \
git \ git \
libffi-dev \
libssl-dev \
libxml2-utils \ libxml2-utils \
locales \ locales \
make \ make \
@ -52,8 +54,7 @@ RUN apt-get update -y && \
&& \ && \
apt-get clean apt-get clean
RUN pip install --upgrade pycrypto RUN pip install --upgrade pycrypto cryptography
# helpful things taken from the ubuntu-upstart Dockerfile: # helpful things taken from the ubuntu-upstart Dockerfile:
# https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/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 ADD init-fake.conf /etc/init/fake-container-events.conf

View file

@ -16,6 +16,8 @@ RUN apt-get update -y && \
fakeroot \ fakeroot \
gawk \ gawk \
git \ git \
libffi-dev \
libssl-dev \
libxml2-utils \ libxml2-utils \
locales \ locales \
make \ make \

View file

@ -17,6 +17,8 @@ RUN apt-get update -y && \
gawk \ gawk \
git \ git \
iproute2 \ iproute2 \
libffi-dev \
libssl-dev \
libxml2-utils \ libxml2-utils \
locales \ locales \
lsb-release \ lsb-release \

View file

@ -15,6 +15,8 @@ RUN apt-get update -y && \
gawk \ gawk \
git \ git \
iproute2 \ iproute2 \
libffi-dev \
libssl-dev \
libxml2-utils \ libxml2-utils \
locales \ locales \
lsb-release \ lsb-release \