From 3eb84f85733a4eeb3684a1e1e666dd2e26fa7139 Mon Sep 17 00:00:00 2001 From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com> Date: Fri, 21 Apr 2023 18:51:25 +0200 Subject: [PATCH] Revert "Latest jinja2 breaks envtpl" envtpl has been updated to work with the latest jinja2 This reverts commit 72a9919cece8615475b4079ac528608e60a2df4a. --- pdns-recursor/Dockerfile | 2 +- pdns-recursor/Dockerfile.alpine | 2 +- pdns/Dockerfile | 2 +- pdns/Dockerfile.alpine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile index aa603b5..d9188f8 100644 --- a/pdns-recursor/Dockerfile +++ b/pdns-recursor/Dockerfile @@ -6,7 +6,7 @@ RUN dnf -y --setopt=install_weak_deps=False install \ python3-setuptools \ && dnf clean all -RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl +RUN pip3 install --no-cache-dir envtpl RUN mkdir -p /etc/pdns-recursor/api.d \ && chown -R pdns-recursor: /etc/pdns-recursor/api.d \ diff --git a/pdns-recursor/Dockerfile.alpine b/pdns-recursor/Dockerfile.alpine index 359b65c..067bfe7 100644 --- a/pdns-recursor/Dockerfile.alpine +++ b/pdns-recursor/Dockerfile.alpine @@ -5,7 +5,7 @@ RUN apk add --no-cache \ py3-pip \ python3 -RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl +RUN pip3 install --no-cache-dir envtpl RUN mkdir -p /etc/pdns/api.d \ && chown -R recursor: /etc/pdns/api.d \ diff --git a/pdns/Dockerfile b/pdns/Dockerfile index c94417e..7a4a282 100644 --- a/pdns/Dockerfile +++ b/pdns/Dockerfile @@ -10,7 +10,7 @@ RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf \ python3-setuptools \ && dnf clean all -RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl +RUN pip3 install --no-cache-dir envtpl ENV VERSION=4.7 \ PDNS_guardian=yes \ diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine index b59178a..9a9878f 100644 --- a/pdns/Dockerfile.alpine +++ b/pdns/Dockerfile.alpine @@ -8,7 +8,7 @@ RUN apk add --no-cache \ py3-pip \ python3 -RUN pip3 install --no-cache-dir 'Jinja2<3.1' envtpl +RUN pip3 install --no-cache-dir envtpl ENV VERSION=4.7 \ PDNS_guardian=yes \