Fix templates dir setting

Author: tarleb

alpine/Dockerfile

@@ -179,12 +179,17 @@ RUN  apk --no-cache add py-pip \
 RUN sed -e 's/ *#.*$//' -e '/^ *$/d' /root/extra_packages.txt | \
     xargs tlmgr install \
     && rm -f /root/extra_packages.txt
-ARG TEMPLATES_DIR=$XDG_DATA_HOME/pandoc
+
+# Templates
+ARG PANDOC_DATA_DIR=$XDG_DATA_HOME/pandoc
+ARG TEMPLATES_DIR=$PANDOC_DATA_DIR/templates
+RUN mkdir -p $TEMPLATES_DIR
 
 # eisvogel
 ARG EISVOGEL_REPO=https://raw.githubusercontent.com/Wandmalfarbe/pandoc-latex-template
 ARG EISVOGEL_VERSION=2.4.2
-RUN wget ${EISVOGEL_REPO}/${EISVOGEL_VERSION}/eisvogel.tex -O ${TEMPLATES_DIR}/eisvogel.latex
+RUN wget ${EISVOGEL_REPO}/${EISVOGEL_VERSION}/eisvogel.tex \
+    -O ${TEMPLATES_DIR}/eisvogel.latex
 
 # Lua filters
 ARG LUA_FILTERS_REPO=https://github.com/pandoc/lua-filters/releases/download

ubuntu/Dockerfile

@@ -190,28 +190,23 @@ RUN sed -e 's/ *#.*$//' -e '/^ *$/d' /root/extra_packages.txt | \
 
 # Templates
 #
-# If docker is run with the `--user` option, the $HOME var
-# is empty when the user does not exist inside the container.
-# This causes several problems for pandoc. We solve the issue
-# by putting the pandoc templates in a shared space (TEMPLATES_DIR)
-# and creating symbolic links inside the `/root` home so that
-# the templates and packages can be accessed by root and a
-# non-existent `--user`
-#
-ARG TEMPLATES_DIR=$XDG_DATA_HOME/pandoc
+ARG PANDOC_DATA_DIR=$XDG_DATA_HOME/pandoc
+ARG TEMPLATES_DIR=$PANDOC_DATA_DIR/templates
+RUN mkdir -p $TEMPLATES_DIR
 
 # eisvogel
 ARG EISVOGEL_REPO=https://raw.githubusercontent.com/Wandmalfarbe/pandoc-latex-template
 ARG EISVOGEL_VERSION=2.4.2
-RUN wget ${EISVOGEL_REPO}/${EISVOGEL_VERSION}/eisvogel.tex -O ${TEMPLATES_DIR}/eisvogel.latex
+RUN wget ${EISVOGEL_REPO}/${EISVOGEL_VERSION}/eisvogel.tex \
+        -O ${TEMPLATES_DIR}/eisvogel.latex
 
 # Lua Filters
 ARG LUA_FILTERS_REPO=https://github.com/pandoc/lua-filters/releases/download
 ARG LUA_FILTERS_VERSION=v2021-11-05
 RUN wget ${LUA_FILTERS_REPO}/${LUA_FILTERS_VERSION}/lua-filters.tar.gz \
     && tar xzf lua-filters.tar.gz \
         --strip-components=1 \
-        --one-top-level=TEMPLATES_DIR \
+        --one-top-level=$PANDOC_DATA_DIR \
     && rm -f lua-filters.tar.gz
 
 # tectonic