Browse Source

Fix jinja error discovered by @sgutierr

master
Nicolas Massé 7 years ago
parent
commit
d3463f3c33
  1. 3
      support/docker/Dockerfile
  2. 3
      support/jenkins/Dockerfile

3
support/docker/Dockerfile

@ -15,6 +15,9 @@ ARG SOURCE_BRANCH=master
RUN yum --enablerepo=extras install -y epel-release centos-release-scl && \
yum-config-manager --enable rhel-server-rhscl-7-rpms && \
yum install -y ansible git python27-python-pip && \
# Remove the existing jinja2 library and its dependencies before re-installing it
# This is mandatory to prevent any leftover from a previous install
rm -rf /usr/lib/python2.7/site-packages/markupsafe /usr/lib/python2.7/site-packages/jinja2 && \
scl enable python27 "pip install --install-option='--install-purelib=/usr/lib/python2.7/site-packages/' jinja2" && \
yum clean all && \
rm -rf /var/cache/yum && \

3
support/jenkins/Dockerfile

@ -14,6 +14,9 @@ USER root
RUN yum install -y epel-release && \
yum install -y 'ansible >= 2.6' && \
yum install -y python27-python-pip && \
# Remove the existing jinja2 library and its dependencies before re-installing it
# This is mandatory to prevent any leftover from a previous install
rm -rf /usr/lib/python2.7/site-packages/markupsafe /usr/lib/python2.7/site-packages/jinja2 && \
scl enable python27 "pip install --install-option='--install-purelib=/usr/lib/python2.7/site-packages/' jinja2" && \
yum clean all && \
rm -rf /var/cache/yum && \

Loading…
Cancel
Save