Use distro packaged jinja2 instead of pip version.

pull/20216/merge
Matt Clay 8 years ago
parent b5d5888b6e
commit 34bca6fb55

@ -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/

@ -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

Loading…
Cancel
Save