Update to Alpine 3.19.1 and fix Pandoc filters

ds-wizard · Feb 25, 2024 · 7a38cb4 · 7a38cb4
1 parent fb7a39b
commit 7a38cb4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 26 deletions.
diff --git a/3.11-basic/Dockerfile b/3.11-basic/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19.0
+FROM alpine:3.19.1
 
 ARG TARGETARCH
 

diff --git a/3.11-docworker/Dockerfile b/3.11-docworker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19.0
+FROM alpine:3.19.1
 
 ARG TARGETARCH
 
@@ -33,32 +33,11 @@ RUN chmod +x /bin/clean \
 
 # Pandoc
 ENV XDG_DATA_HOME=/ \
-    LUA_PATH="/pandoc/filters/?.lua;;"
+    LUA_PATH="/pandoc/filters/?.lua;/usr/share/lua/common/?.lua;;"
 
 RUN wget -O /tmp/pandoc.tar.gz "https://github.com/jgm/pandoc/releases/download/3.1.9/pandoc-3.1.9-linux-${TARGETARCH}.tar.gz" \
     && tar -xvzf /tmp/pandoc.tar.gz -C /tmp && mv /tmp/pandoc*/bin/pandoc /usr/local/bin/pandoc \
-    && clean
-
-RUN mkdir -p /pandoc/templates \
-    && wget -O /pandoc/templates/eisvogel.latex https://raw.githubusercontent.com/Wandmalfarbe/pandoc-latex-template/v2.2.0/eisvogel.tex \
-    && wget -O /pandoc/templates/template-letter.tex https://raw.githubusercontent.com/aaronwolen/pandoc-letter/master/template-letter.tex \
-    && wget -O /pandoc/templates/chmduquesne.tex https://raw.githubusercontent.com/mszep/pandoc_resume/master/styles/chmduquesne.tex \
-    && wget -O /pandoc/templates/chmduquesne.css https://raw.githubusercontent.com/mszep/pandoc_resume/master/styles/chmduquesne.css \
-    && wget -O /pandoc/templates/leaflet.latex https://gitlab.com/daamien/pandoc-leaflet-template/raw/1.0/leaflet.latex \
-    && chown -R user:user /pandoc \
-    && clean
-
-RUN mkdir -p /pandoc/filters \
-    && wget -O /tmp/pandoc-filters.zip https://github.com/teoric/pandoc-filters/archive/master.zip && unzip /tmp/pandoc-filters.zip -d /tmp && cd /tmp/pandoc-filters* && find . -name '*.lua' | cpio -pdm /pandoc/filters && clean \
-    && wget -O /tmp/filters.zip https://github.com/pandoc/lua-filters/archive/master.zip && unzip /tmp/filters.zip -d /tmp && cp -r /tmp/lua-filters*/**/*.lua /pandoc/filters && clean\
-    && wget -O /pandoc/filters/select-meta.lua https://github.com/jgm/select-meta/blob/master/select-meta.lua && clean \
-    && wget -O /pandoc/filters/table.lua https://raw.githubusercontent.com/PlushBeaver/pandoc-table-filter/master/table.lua && clean \
-    && wget -O /tmp/panpipe.zip https://github.com/mitinarseny/panpipe/archive/master.zip && unzip /tmp/panpipe.zip -d /tmp && cp -r /tmp/panpipe*/*.lua /pandoc/filters && clean \
-    && wget -O /pandoc/filters/gls.lua https://raw.githubusercontent.com/tomncooper/pandoc-gls/master/pandoc-gls.lua && clean \
-    && wget -O /tmp/pandoc-filters.zip https://github.com/a-vrma/pandoc-filters/archive/master.zip && unzip /tmp/pandoc-filters.zip -d /tmp && cp -r /tmp/pandoc-filters*/dist/*.lua /pandoc/filters && clean \
-    && wget -O /tmp/pandocker-lua-filters.zip https://github.com/pandocker/pandocker-lua-filters/archive/master.zip && unzip /tmp/pandocker-lua-filters.zip -d /tmp && cp -r /tmp/pandocker-lua-filters*/lua/*.lua /pandoc/filters && clean \
-    && wget -O /tmp/pandoc-odt-filters.zip https://github.com/jzeneto/pandoc-odt-filters/archive/master.zip && unzip /tmp/pandoc-odt-filters.zip -d /tmp && cp -r /tmp/pandoc-odt-filters*/*.lua /pandoc/filters && clean \
-    && wget -O /tmp/pandoc-filters.zip https://github.com/hason/pandoc-filters/archive/master.zip && unzip /tmp/pandoc-filters.zip -d /tmp && cd /tmp/pandoc-filters* && find . -name '*.lua' | cpio -pdm /pandoc/filters && clean \
-    && wget -O /pandoc/filters/logging.lua https://raw.githubusercontent.com/wlupton/pandoc-lua-logging/main/logging.lua \
+    && mkdir -p /pandoc/templates \
+    && mkdir -p /pandoc/filters/pandocker \
     && chown -R user:user /pandoc \
     && clean