Jinja2 is not maintained and broken

migrate to jinjanator
Wolvverine · May 24, 2024 · b0a13f4 · b0a13f4
1 parent 6eaecdb
commit b0a13f4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Dockerfile_nginx-72 b/Dockerfile_nginx-72
@@ -52,7 +52,7 @@ RUN set -ex; \
       tzdata \
     ; \
     pip3 install \
-      j2cli \
+      jinjanator \
     ; \
     apk add --no-cache --virtual .build-deps \
         $PHPIZE_DEPS \

diff --git a/Dockerfile_nginx-74 b/Dockerfile_nginx-74
@@ -58,8 +58,7 @@ RUN set -ex; \
       tzdata \
     ; \
     pip3 install \
-      j2cli \
-      jinja2-getenv-extension \
+      jinjanator \
     ; \
     apk add --no-cache --virtual .build-deps \
         $PHPIZE_DEPS \

diff --git a/Dockerfile_nginx-82 b/Dockerfile_nginx-82
@@ -63,8 +63,7 @@ RUN set -ex; \
       tzdata \
     ; \
     pip3 install --break-system-packages \
-      j2cli \
-      jinja2-getenv-extension \
+      jinjanator \
     ; \
     apk add --no-cache --virtual .build-deps \
         $PHPIZE_DEPS \

diff --git a/docker-entrypoint.d/10phpfpm b/docker-entrypoint.d/10phpfpm
@@ -2,10 +2,10 @@
 set -e
 
 echo 'Configuring PHP FPM...'
-j2 /etc/php-fpm.d/nginx.conf.j2 -o /usr/local/etc/php-fpm.d/zzz-nginx.conf
-j2 /etc/php-fpm.d/custom.conf.j2 -o /usr/local/etc/php-fpm.d/zzz-tuning.conf
+jinjanate /etc/php-fpm.d/nginx.conf.j2 -o /usr/local/etc/php-fpm.d/zzz-nginx.conf
+jinjanate /etc/php-fpm.d/custom.conf.j2 -o /usr/local/etc/php-fpm.d/zzz-tuning.conf
 # to lowercase
 PHP_XDEBUG=$(echo "${PHP_XDEBUG}" | tr '[:upper:]' '[:lower:]')
 if [ "${PHP_XDEBUG}" = "yes"  ]; then
-    j2 /etc/php-fpm.d/xdebug.conf.j2 -o /usr/local/etc/php-fpm.d/xdebug-config.conf
+    jinjanate /etc/php-fpm.d/xdebug.conf.j2 -o /usr/local/etc/php-fpm.d/xdebug-config.conf
 fi