From d3463f3c33574ccf4b9e097dce15b6ac2e11b2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Wed, 12 Jun 2019 17:06:13 +0200 Subject: [PATCH] Fix jinja error discovered by @sgutierr --- support/docker/Dockerfile | 3 +++ support/jenkins/Dockerfile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 9e95a01..0986e46 100644 --- a/support/docker/Dockerfile +++ b/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 && \ diff --git a/support/jenkins/Dockerfile b/support/jenkins/Dockerfile index f50e54a..92045f5 100644 --- a/support/jenkins/Dockerfile +++ b/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 && \