cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use distro packaged jinja2 instead of pip version.

Browse source
This commit is contained in:
Matt Clay 2017-01-16 11:41:48 -08:00
parent b5d5888b6e
commit 34bca6fb55
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/utils/docker/centos6/Dockerfile
View file

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

3
test/utils/docker/ubuntu1204/Dockerfile
View file

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