From 78e705218988582d0ffaa276ba478a69359d4151 Mon Sep 17 00:00:00 2001
From: eneller <erikneller@gmx.de>
Date: Thu, 3 Jul 2025 13:51:01 +0200
Subject: [PATCH] fix: Docker pandoc version

manual pandoc install in docker
---
 .gitignore         |  1 +
 Dockerfile         | 12 +++++++++---
 docker-compose.yml |  6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90f41c1..1c25568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -372,3 +372,4 @@ pyrightconfig.json
 # End of https://www.toptal.com/developers/gitignore/api/python,django,visualstudiocode,intellij+all
 
 staticfiles/
+.docker/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 6860889..71b8866 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,19 @@ VOLUME [ "/app/src/epub2go_web/media" ]
 EXPOSE 50000/tcp
 EXPOSE 50000/udp
 ENV DJANGO_DEBUG=FALSE
+ARG BUILDARCH
 
-COPY --from=ghcr.io/astral-sh/uv:0.7.18 /uv /uvx /bin/
 
 WORKDIR /app
 # Install dependencies
-RUN apt-get update
-RUN apt-get install -y pandoc
+# Manually install pandoc because debian repo version is ooold
+RUN <<EOF
+wget -O pandoc.deb https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-1-${BUILDARCH}.deb \
+&& dpkg -i pandoc.deb
+EOF
+
+COPY --from=ghcr.io/astral-sh/uv:0.7.18 /uv /uvx /bin/
+# Install python deps
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
diff --git a/docker-compose.yml b/docker-compose.yml
index 185b177..1053770 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
         env_file:
             - .env
         volumes:
-            - ./data:/app/src/epub2go_web/media
+            - ./.docker/data:/app/src/epub2go_web/media
     redis:
         image: redis
     celery:
@@ -22,6 +22,6 @@ services:
             - app
         env_file:
             - .env
-        volumes:
-            - ./data:/app/src/epub2go_web/media
         command: uv run --directory=/app/src celery -A epub2go_web worker --loglevel=INFO
+        volumes_from:
+            - app