Docker image updates for integration tests. (#26054)

* Sort packages to install.
* Add python-argparse to centos6 docker image.
* Add gcc and python dev lib to docker images.
* Add python cryptography to docker images.
* Add coverage using pip instead of OS packages.
* Update old pip versions in docker images.
* Exclude */pyshared/* from coverage reporting.
This commit is contained in:
Matt Clay
2017-06-23 12:45:38 -07:00
committed by GitHub
parent 3e52f47b51
commit 4530eea7f8
11 changed files with 33 additions and 22 deletions

View File

@@ -15,6 +15,7 @@ RUN apt-get update -y && \
dpkg-dev \
fakeroot \
gawk \
gcc \
git \
libffi-dev \
libssl-dev \
@@ -25,7 +26,7 @@ RUN apt-get update -y && \
mysql-server \
openssh-client \
openssh-server \
python-coverage \
python-dev \
python-httplib2 \
python-jinja2 \
python-keyczar \
@@ -51,6 +52,8 @@ RUN apt-get update -y && \
&& \
apt-get clean
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
@@ -87,6 +90,7 @@ RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \
for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
VOLUME /sys/fs/cgroup /run/lock /run /tmp
RUN pip install junit-xml
RUN pip install pip --upgrade
RUN pip install coverage junit-xml
ENV container=docker
CMD ["/sbin/init"]