From e9731b6bac5047a5a4427bb01ce5eda6056085ea Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Sun, 26 May 2019 03:46:53 -0700
Subject: [PATCH] Docker: upgrade pip, temporarily enable community repository
 for qpdf

---
 .docker/alpine.dockerfile | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.docker/alpine.dockerfile b/.docker/alpine.dockerfile
index d54951f6..5a16c843 100644
--- a/.docker/alpine.dockerfile
+++ b/.docker/alpine.dockerfile
@@ -4,25 +4,30 @@ FROM base as builder
 
 ENV LANG=C.UTF-8
 
+# Normally:
+# echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories
+
 RUN \
-  echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
+  echo -e '@testing http://nl.alpinelinux.org/alpine/edge/testing\n@community http://nl.alpinelinux.org/alpine/edge/community'\
+  >> /etc/apk/repositories \
   # Add runtime dependencies
   && apk add --update \
     python3-dev \
     py3-setuptools \
     jbig2enc@testing \
     ghostscript \
-    qpdf \
+  qpdf@community \
     tesseract-ocr \
     unpaper \
     pngquant \
     libxml2-dev \
     libxslt-dev \
     zlib-dev \
-    qpdf-dev \
+  qpdf-dev@community \
     libffi-dev \
     leptonica-dev \
     binutils \
+  && pip3 install --upgrade pip \
   # Install pybind11 for pikepdf
   && pip3 install pybind11 \
   # Install flask for the webservice
@@ -42,14 +47,18 @@ FROM base
 
 ENV LANG=C.UTF-8
 
+# Normally:
+# echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories
+
 RUN \
-  echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
+  echo -e '@testing http://nl.alpinelinux.org/alpine/edge/testing\n@community http://nl.alpinelinux.org/alpine/edge/community'\
+  >> /etc/apk/repositories \
   # Add runtime dependencies
   && apk add --update \
     python3 \
     jbig2enc@testing \
     ghostscript \
-    qpdf \
+  qpdf@community \
     tesseract-ocr \
     tesseract-ocr-data-deu \
     tesseract-ocr-data-chi_sim \
@@ -58,7 +67,6 @@ RUN \
     libxml2 \
     libxslt \
     zlib \
-    qpdf \
     libffi \
     leptonica-dev \
     binutils \