simplify / use multi-stage build

.github/workflows/ubuntu.yml

@@ -13,7 +13,7 @@ jobs:
       run: git submodule update --init --recursive
 
     - name: Build the Docker image
-      run: docker build . --file ubuntu/Dockerfile --tag dalibo/pandocker:xxxxx-test-githubci-ubuntu
+      run: docker build . --target extra --tag dalibo/pandocker:xxxxx-test-githubci-ubuntu
 
     - name: Regression Tests
       run: TAG=xxxxx-test-githubci-ubuntu VARIANT=ubuntu ./tests/libs/bats-core/bin/bats tests/extra.bats --tap
@@ -27,7 +27,7 @@ jobs:
       run: git submodule update --init --recursive
 
     - name: Build the Docker image
-      run: docker build . --file ubuntu-full/Dockerfile --tag dalibo/pandocker:xxxxx-test-githubci-ubuntu-full
+      run: docker build . --target full --tag dalibo/pandocker:xxxxx-test-githubci-ubuntu-full
 
     - name: Regression Tests
       run: TAG=xxxxx-test-githubci-ubuntu-full VARIANT=ubuntu-full ./tests/libs/bats-core/bin/bats tests/full.bats --tap

Dockerfile

@@ -0,0 +1,221 @@
+# A simple Pandoc machine for pandoc with filters, fonts and the latex bazaar
+#
+# Based on :
+#    https://github.com/jagregory/pandoc-docker/blob/master/Dockerfile
+#    https://github.com/geometalab/docker-pandoc/blob/develop/Dockerfile
+#    https://github.com/vpetersson/docker-pandoc/blob/master/Dockerfile
+
+FROM pandoc/extra:3.2-ubuntu as extra
+
+# Set the env variables to non-interactive
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_PRIORITY critical
+ENV DEBCONF_NOWARNINGS yes
+
+#
+# Ubuntu packages
+#
+RUN set -x && \
+    apt-get -qq update && \
+    apt-get -qy install --no-install-recommends \
+        # for pandoc filters
+        python-is-python3 \
+        # for deployment
+        openssh-client \
+        rsync \
+        # for locales and utf-8 support
+        locales \
+        # latex toolchain
+        ghostscript \
+        lmodern \
+        texlive \
+        texlive-lang-french \
+        texlive-lang-german \
+        texlive-lang-european \
+        texlive-lang-spanish \
+        texlive-luatex \
+        texlive-pstricks \
+        texlive-xetex \
+        xzdec \
+        # reveal (see issue #18)
+        netbase \
+        # fonts
+        fonts-dejavu \
+        fonts-font-awesome \
+        fonts-lato \
+        fonts-liberation \
+        # build tools
+        make \
+        git \
+        parallel \
+        wget \
+        unzip \
+        # required for PDF meta analysis
+        poppler-utils \
+    # clean up
+    && apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+#
+# Set Locale for UTF-8 support
+# This is needed for panflute filters see :
+# https://github.com/dalibo/pandocker/pull/86
+#
+RUN locale-gen C.UTF-8
+ENV LANG C.UTF-8
+
+#
+# SSH pre-config / useful for Gitlab CI
+# See Issue #87
+#
+RUN mkdir -p ~/.ssh && \
+    /bin/echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+
+##
+## R E V E A L J S
+##
+
+#
+# The easiest way to produce reveal slides is to point to a CDN like this:
+#
+#    -V revealjs-url=https://unpkg.com/reveal.js
+#
+# However it's useful to have revealjs inside pandocker when you want
+# to build offline
+#
+
+# pandoc 2.10+ requires revealjs 4.x
+ARG REVEALJS_VERSION=4.1.2
+RUN wget https://github.com/hakimel/reveal.js/archive/${REVEALJS_VERSION}.tar.gz -O revealjs.tar.gz && \
+    tar -xzvf revealjs.tar.gz && \
+    cp -r reveal.js-${REVEALJS_VERSION}/dist / && \
+    cp -r reveal.js-${REVEALJS_VERSION}/plugin /
+
+
+##
+## F I L T E R S
+##
+
+# Python filters
+# The option `--break-system-packages` sounds bad but this is not
+# really a problem here because we are not using Python debian packages
+# anyway.
+ADD requirements.txt ./
+RUN pip3 --no-cache-dir install -r requirements.txt --break-system-packages
+
+# Lua filters
+ARG PANDA_REPO=https://github.com/CDSoft/panda.git
+ARG PANDA_VERSION=8dcbe68
+RUN git clone ${PANDA_REPO} /tmp/panda && \
+    cd /tmp/panda && \
+    git checkout ${PANDA_VERSION} && \
+    make install && \
+    rm -fr /tmp/panda
+
+
+##
+## L A T E X
+##
+ADD packages.txt ./
+RUN tlmgr init-usertree && \
+    tlmgr install `echo $(grep -v '^#' packages.txt )` && \
+    # update the font map
+    updmap-sys
+
+##
+##
+## T E M P L A T E S
+##
+
+# Templates are installed in '/.pandoc'.
+ARG TEMPLATES_DIR=/.pandoc/templates
+
+# Starting with 24.04, there's a user named `ubuntu` with id=1000
+# If docker is run with the `--user 1000` option and $HOME for pandoc
+# will be `/home/ubuntu`
+RUN ln -s /.pandoc /home/ubuntu/.pandoc
+
+# Easy templates
+ARG EASY_REPO=https://raw.githubusercontent.com/ryangrose/easy-pandoc-templates/
+ARG EASY_VERSION=9a884190fe19782f4434851053947173f8cec3d2
+
+RUN wget ${EASY_REPO}/${EASY_VERSION}/html/uikit.html -O ${TEMPLATES_DIR}/uikit.html && \
+    wget ${EASY_REPO}/${EASY_VERSION}/html/bootstrap_menu.html -O ${TEMPLATES_DIR}/bootstrap_menu.html && \
+    wget ${EASY_REPO}/${EASY_VERSION}/html/clean_menu.html -O ${TEMPLATES_DIR}/clean_menu.html && \
+    wget ${EASY_REPO}/${EASY_VERSION}/html/easy_template.html -O ${TEMPLATES_DIR}/easy_template.html && \
+    wget ${EASY_REPO}/${EASY_VERSION}/html/elegant_bootstrap_menu.html -O ${TEMPLATES_DIR}/elegant_bootstrap_menu.html
+
+
+##
+## E N D
+##
+VOLUME /pandoc
+WORKDIR /pandoc
+
+ENTRYPOINT ["pandoc"]
+
+
+# This versions extends the buster image with :
+#
+# * International Fonts
+# * Emojis
+#    https://github.com/vpetersson/docker-pandoc/blob/master/Dockerfile
+#
+FROM extra as full
+
+# Proxy to APT cacher: e.g. http://apt-cacher-ng.docker:3142
+ARG APT_CACHER
+
+# Set the env variables to non-interactive
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_PRIORITY critical
+ENV DEBCONF_NOWARNINGS yes
+
+#
+# Debian
+#
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN set -x && \
+    # Setup a cacher to speed up build
+    if [ -n "${APT_CACHER}" ] ; then \
+        echo "Acquire::http::Proxy \"${APT_CACHER}\";" | tee /etc/apt/apt.conf.d/01proxy ; \
+    fi; \
+    apt-get -qq update && \
+    apt-get -qy install --no-install-recommends \
+        #
+        texlive-lang-other \
+        # hindi fonts
+        fonts-deva \
+        # persian fonts
+        texlive-lang-arabic \
+        fonts-farsiweb \
+        # dia
+        dia \
+        # Noto font families with large Unicode coverage
+        fonts-noto \
+        fonts-noto-cjk \
+        fonts-noto-cjk-extra \
+        fonts-noto-color-emoji \
+        fonts-noto-core \
+        fonts-noto-extra \
+        fonts-noto-mono \
+    # clean up
+    && apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /etc/apt/apt.conf.d/01proxy
+
+##
+## L A T E X
+##
+ADD ubuntu-full/packages.txt ./
+# The TexLive user mode database already set up; no need to run `tlmgr init-tree`
+RUN tlmgr install `echo $(grep -v '^#' packages.txt )` && \
+    # update the font map
+    updmap-sys
+
+##
+## E N T R Y P O I N T
+##
+VOLUME /pandoc
+WORKDIR /pandoc
+
+ENTRYPOINT ["pandoc"]

Makefile

@@ -69,6 +69,14 @@ stretch: stretch/Dockerfile
 	    --build-arg PANDOC_CROSSREF_VERSION=$(CROSSREF_VERSION) \
 	    --tag $(NAME):$@-$(TAG) --file $^ .
 
+.PHONY: extra
+extra: Dockerfile
+	docker build --tag $(NAME):$@-$(TAG) --file $^ . --target extra
+
+.PHONY: full
+full: Dockerfile
+	docker build --tag $(NAME):$@-$(TAG) --file $^ . --target full
+
 .PHONY: ubuntu
 ubuntu: ubuntu/Dockerfile #: Extra variant based on Ubuntu
 	docker build --tag $(NAME):$@-$(TAG) --file $^ .