Use Ubuntu-based Docker image for test image

Author: tarleb

.tools/Dockerfile

@@ -1,58 +1,43 @@
-FROM pandoc/latex:latest as matplotlib-builder
-RUN apk --no-cache add \
-        alpine-sdk \
-        freetype-dev \
-        libpng \
-        libpng-dev \
-        pkgconf \
-        python3 \
-        python3-dev
-RUN pip3 install matplotlib
+FROM tarleb/pandoc-ubuntu:latest
 
-FROM pandoc/latex:latest
-RUN apk --no-cache add \
-        aspell \
-        aspell-en \
-        aspell-fr \
-        bash \
-        fontconfig \
-        graphviz \
-        inkscape \
-        libpng \
-        make \
-        openjdk8-jre \
-        python \
-        python3 \
-        ttf-dejavu \
-        wget
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_PRIORITY critical
 
-RUN tlmgr install \
-        adjustbox \
-        bibexport \
-        changes \
-        collectbox \
-        ifmtarg \
-        silence \
-        standalone \
-        todonotes \
-        truncate \
-        xifthen \
-        xstring
+RUN apt-get -q --no-allow-insecure-repositories update \
+  && DEBIAN_FRONTEND=noninteractive \
+     apt-get install --assume-yes --no-install-recommends \
+       aspell \
+       aspell-fr \
+       aspell-en \
+       default-jre \
+       graphviz \
+       imagemagick \
+       inkscape \
+       lilypond \
+       lmodern \
+       luarocks \
+       make \
+       python3 \
+       python3-pip \
+       python3-tk \
+       python3-numpy \
+       python3-matplotlib \
+       python-is-python3 \
+       texlive-bibtex-extra \
+       texlive-fonts-recommended \
+       texlive-latex-recommended \
+       texlive-latex-extra \
+       texlive-pictures \
+       texlive-plain-generic \
+       texlive-xetex \
+       wget
 
-COPY --from=matplotlib-builder \
-  /usr/lib/python3.6/site-packages/ \
-  /usr/lib/python3.6/site-packages/
+ARG plantuml_jar=plantuml.1.2018.9.jar
+RUN wget https://sourceforge.net/projects/plantuml/files/${plantuml_jar} \
+      --quiet --output-document=/root/${plantuml_jar}
+ENV PLANTUML=/root/$plantuml_jar
+ENV DIFF="diff -u"
+ENV LC_ALL="C.UTF-8"
+ENV LANG="C.UTF-8"
 
-# Download plantuml.jar for plantuml filter
-ARG plantuml_filename="plantuml.1.2018.9.jar"
-RUN cd $HOME && \
-    wget --quiet https://sourceforge.net/projects/plantuml/files/$plantuml_filename && \
-    cd -
-
-ENV PLANTUML "/root/$plantuml_filename"
-ENV DIFF "diff -u"
-
-# Override entrypoint set in parent image (defaults to "/usr/bin/pandoc"). This
-# image should behave like a base image.
-ENTRYPOINT []
-CMD [ "/bin/sh" ]
+ENTRYPOINT ["/bin/bash"]

Makefile

@@ -1,6 +1,6 @@
 FILTERS=$(wildcard $(shell find * -type d | grep -v '[/\\]'))
 FILTER_FILES=$(shell find * -name "*.lua" -type f)
-LUA_FILTERS_TEST_IMAGE = pandoc/lua-filters-test
+LUA_FILTERS_TEST_IMAGE = tarleb/lua-filters-test
 
 .PHONY: test show-args docker-test docker-test-image archive
 
@@ -14,8 +14,11 @@ show-vars:
 	@printf "FILTER_FILES: %s\n" $(FILTER_FILES)
 
 docker-test:
-	docker run --rm --volume "$(PWD):/data" $(LUA_FILTERS_TEST_IMAGE) \
-	    make test
+	docker run \
+	       --rm \
+	       --volume "$(PWD):/data" \
+		     --entrypoint /usr/bin/make \
+	       $(LUA_FILTERS_TEST_IMAGE)
 
 docker-test-image: .tools/Dockerfile
 	docker build --tag $(LUA_FILTERS_TEST_IMAGE) --file $< .

pandoc-quotes.lua/Makefile

@@ -6,21 +6,21 @@ NORM_DIR := $(BASE_DIR)/norms
 TESTS := test-simple test-lookup-simple test-lookup-void-country \
 	test-lookup-mapping test-lookup-no-fallback
 
-test: test-noop $(TESTS) 
+test: test-noop $(TESTS)
 
 prepare-tmp:
-	mkdir -p test/tmp
-	rm -f test/tmp/*
+	@mkdir -p test/tmp
+	@rm -f test/tmp/*
 
 test-noop: prepare-tmp
-	pandoc --lua-filter ./pandoc-quotes.lua -f markdown-smart \
+	@pandoc --lua-filter ./pandoc-quotes.lua -f markdown-smart -t html \
 		-o $(TMP_DIR)/$@.out $(DATA_DIR)/$@.md
-	cmp $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
+	@cmp $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
 
 $(TESTS): prepare-tmp
-	pandoc --lua-filter ./pandoc-quotes.lua \
+	@pandoc --lua-filter ./pandoc-quotes.lua -t html \
 		-o $(TMP_DIR)/$@.out $(DATA_DIR)/$@.md
-	cmp $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
+	@cmp $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
 
 
-.PHONY: prepare-tmp test $(TESTS) 
+.PHONY: prepare-tmp test $(TESTS)