From 34bca6fb5574863830d467a7c4ada9e6f4bc2585 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 16 Jan 2017 11:41:48 -0800 Subject: [PATCH] Use distro packaged jinja2 instead of pip version. --- test/utils/docker/centos6/Dockerfile | 3 ++- test/utils/docker/ubuntu1204/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/utils/docker/centos6/Dockerfile b/test/utils/docker/centos6/Dockerfile index 0df94284d8..1927d9f766 100644 --- a/test/utils/docker/centos6/Dockerfile +++ b/test/utils/docker/centos6/Dockerfile @@ -19,6 +19,7 @@ RUN yum clean all && \ python-coverage \ python-devel \ python-httplib2 \ + python-jinja2 \ python-keyczar \ python-mock \ python-nose \ @@ -39,7 +40,7 @@ RUN yum clean all && \ && \ yum clean all -RUN rpm -e --nodeps python-crypto && pip install --upgrade jinja2 pycrypto +RUN rpm -e --nodeps python-crypto && pip install --upgrade pycrypto RUN /bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN mkdir /etc/ansible/ diff --git a/test/utils/docker/ubuntu1204/Dockerfile b/test/utils/docker/ubuntu1204/Dockerfile index a06f214635..36601a105a 100644 --- a/test/utils/docker/ubuntu1204/Dockerfile +++ b/test/utils/docker/ubuntu1204/Dockerfile @@ -27,6 +27,7 @@ RUN apt-get update -y && \ python-coverage \ python-dev \ python-httplib2 \ + python-jinja2 \ python-keyczar \ python-mock \ python-mysqldb \ @@ -49,7 +50,7 @@ RUN apt-get update -y && \ && \ apt-get clean -RUN pip install --upgrade jinja2 pycrypto +RUN pip install --upgrade pycrypto # helpful things taken from the ubuntu-upstart Dockerfile: # https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile