aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2020-04-03 11:14:42 +0100
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2020-04-03 11:14:42 +0100
commit9b25e5463f3b58b07d9093693ceb197956756afe (patch)
tree58cc3585599ea4c9afaff100b13003219fbdfa56
parentfix name in makefile (diff)
parentMerge branch 'master' into ClaytonJY-upgrade-cairo (diff)
downloadpaper2remarkable-9b25e5463f3b58b07d9093693ceb197956756afe.tar.gz
paper2remarkable-9b25e5463f3b58b07d9093693ceb197956756afe.zip
Merge branch 'ClaytonJY-upgrade-cairo'
-rw-r--r--Dockerfile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 86743a2..e6fc152 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:stretch AS rmapi
+FROM golang:buster AS rmapi
ENV GOPATH /go
ENV PATH ${GOPATH}/bin:/usr/local/go/bin:$PATH
@@ -7,18 +7,21 @@ ENV RMAPIREPO github.com/juruen/rmapi
RUN go get -u ${RMAPIREPO}
-FROM python:3.7-slim-stretch
+FROM python:3.7-slim-buster
# rmapi
COPY --from=rmapi /go/bin/rmapi /usr/bin/rmapi
-# imagemagick, pdftk, ghostscript, pdfcrop
+# needed to install openjdk-11-jre-headless
+RUN mkdir -p /usr/share/man/man1
+
+# imagemagick, pdftk, ghostscript, pdfcrop, weasyprint
RUN apt-get update \
&& apt-get install --no-install-recommends -y \
libmagickwand-dev \
pdftk \
ghostscript \
- poppler-utils
+ poppler-utils
RUN pip install --no-cache-dir paper2remarkable