From ff350a2b89d2d0fe44a3f133f3fbde9be66cb282 Mon Sep 17 00:00:00 2001 From: Justin McCarthy Date: Wed, 23 May 2018 16:46:28 -0700 Subject: [PATCH] Prepare pandoc upgrade (not pushed to docker hub yet) --- Makefile | 1 - build/Dockerfile | 29 +++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 984155a..41f4790 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,6 @@ export-example: docker: cd build && docker build -t strongdm/pandoc . - docker tag jagregory/pandoc:latest strongdm/pandoc:latest docker push strongdm/pandoc cleanse: diff --git a/build/Dockerfile b/build/Dockerfile index bd85414..f3c335a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,3 +1,28 @@ -FROM scratch +FROM haskell:latest -MAINTAINER strongDM Comply \ No newline at end of file +# based on implementation by James Gregory +MAINTAINER Comply + +# install latex packages +RUN apt-get update -y \ + && apt-get install -y -o Acquire::Retries=10 --no-install-recommends \ + texlive-latex-base \ + texlive-xetex \ + latex-xcolor \ + texlive-latex-extra \ + fontconfig \ + unzip \ + lmodern + +# will ease up the update process +# updating this env variable will trigger the automatic build of the Docker image +ENV PANDOC_VERSION "2.2.1" + +# install pandoc +RUN cabal update && cabal install pandoc-${PANDOC_VERSION} + +WORKDIR /source + +ENTRYPOINT ["/root/.cabal/bin/pandoc"] + +CMD ["--help"] \ No newline at end of file