docker: update dependencies and migrate from j2cli to jinjanator

verdel · Feb 15, 2024 · e975b3b · e975b3b
1 parent 97c552e
commit e975b3b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM python:3.11 as builder
+FROM python:3.12 as builder
 
-RUN pip install poetry==1.6.1
+RUN pip install poetry==1.7.1
 
 ENV POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
@@ -13,9 +13,9 @@ COPY pyproject.toml poetry.lock ./
 
 RUN poetry install --without dev --no-root
 
-FROM python:3.11-slim as runtime
+FROM python:3.12-slim as runtime
 
-RUN pip install j2cli
+RUN pip install jinjanator jinjanator-plugin-ansible
 
 ENV VIRTUAL_ENV=/app/.venv \
     PATH="/app/.venv/bin:$PATH"

diff --git a/docker/rootfs/docker-entrypoint.sh b/docker/rootfs/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -f /opt/transmission-telegram-bot/config.yml.j2 ];then
-    j2 --filter /opt/j2cli/env_json.py -o /opt/transmission-telegram-bot/config.yml /opt/transmission-telegram-bot/config.yml.j2
+    jinjanate -o /opt/transmission-telegram-bot/config.yml --quiet /opt/transmission-telegram-bot/config.yml.j2
     rm /opt/transmission-telegram-bot/config.yml.j2
 fi
 

diff --git a/docker/rootfs/opt/j2cli/env_json.py b/docker/rootfs/opt/j2cli/env_json.py
diff --git a/docker/rootfs/opt/transmission-telegram-bot/config.yml.j2 b/docker/rootfs/opt/transmission-telegram-bot/config.yml.j2
@@ -1,7 +1,7 @@
 telegram:
     token: {{ TELEGRAM_TOKEN }}
     allow_chat:
-{% for item in ALLOW_CHAT|env_json %}
+{% for item in ALLOW_CHAT | from_json %}
         - telegram_id: {{ item['telegram_id'] }}
           torrent_permission: '{{ item['torrent_permission'] }}'
           notify: {{ item['notify'] | default("personal") }}
@@ -21,7 +21,7 @@ transmission:
     user: {{ TRANSMISSION_USERNAME }}
     password: {{ TRANSMISSION_PASSWORD }}
     path:
-{% for item in TRANSMISSION_PATH|env_json %}
+{% for item in TRANSMISSION_PATH | from_json %}
       - category: {{ item['category'] }}
         dir: '{{ item['dir'] }}'
 {% endfor %}