Move from jinjanator to minijinja-cli

dtcooper · Sep 20, 2024 · 886c6b6 · 886c6b6
1 parent 29cb79e
commit 886c6b6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/server/nginx/Dockerfile b/server/nginx/Dockerfile
@@ -1,8 +1,16 @@
-FROM jonasal/nginx-certbot:5.4-alpine
+FROM rust:alpine AS minijina-builder
 
-ARG PIP_BREAK_SYSTEM_PACKAGES=1
-ARG JINJANATOR_VERSION=24.3.0
+ARG MINIJINJA_VERSION=2.3.1
+RUN cargo install \
+            --root /build \
+            --version "${MINIJINJA_VERSION}" \
+            --no-default-features \
+        minijinja-cli \
+    && strip /build/bin/minijinja-cli
 
-RUN pip install --no-cache-dir "jinjanator==${JINJANATOR_VERSION}"
+
+FROM jonasal/nginx-certbot:5.4-alpine AS final
+
+COPY --from=minijina-builder /build/bin/minijinja-cli /usr/local/bin/
 
 ADD image/ /
diff --git a/server/nginx/image/docker-entrypoint.d/25-jinja2-on-templates.sh b/server/nginx/image/docker-entrypoint.d/25-jinja2-on-templates.sh
@@ -28,8 +28,8 @@ auto_j2() {
     output_path="$output_dir/${relative_path%$suffix}"
     subdir=$(dirname "$relative_path")
     mkdir -p "$output_dir/$subdir"
-    entrypoint_log "$ME: Running jinjanate on $template to $output_path"
-    jinjanate --quiet "$template" > "$output_path"
+    entrypoint_log "$ME: Running minijinja-cli on $template to $output_path"
+    minijinja-cli --env --strict --output "$output_path" "$template"
   done
 }
 

diff --git a/server/nginx/image/etc/nginx/templates/app.conf.j2 b/server/nginx/image/etc/nginx/templates/app.conf.j2
@@ -14,7 +14,7 @@ server {
     listen 443 ssl default_server reuseport;
     http2 on;
 
-    server_name {{ DOMAIN_NAME }};
+    server_name {{ ENV.DOMAIN_NAME }};
 
     ssl_certificate /etc/letsencrypt/live/tomato/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/tomato/privkey.pem;
@@ -24,7 +24,7 @@ server {
     client_max_body_size 25M;
     client_body_buffer_size 1M;
 
-    {% if DEBUG|int %}
+    {% if ENV.DEBUG|int %}
         # Static files disabled by when DEBUG is true
     {% else %}
         # Static files enabled when DEBUG is false