From 692f7b31516fe73265f5c3adcc4926140efdc5eb Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Sun, 26 May 2019 04:31:53 -0700
Subject: [PATCH] Dockerfile: with newer pip

Newer pip seems to install ocrmypdf-*.dist-info and has no problem reporting
installed version unlike -egg-info, so
skip copying.

Also move WORKDIR
---
 .docker/alpine.dockerfile | 62 +++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/.docker/alpine.dockerfile b/.docker/alpine.dockerfile
index 264968fc..7145199f 100644
--- a/.docker/alpine.dockerfile
+++ b/.docker/alpine.dockerfile
@@ -12,21 +12,21 @@ RUN \
   >> /etc/apk/repositories \
   # Add runtime dependencies
   && apk add --update \
-    python3-dev \
-    py3-setuptools \
-    jbig2enc@testing \
-    ghostscript \
+  python3-dev \
+  py3-setuptools \
+  jbig2enc@testing \
+  ghostscript \
   qpdf@community \
   qpdf-dev@community \
-    tesseract-ocr \
-    unpaper \
-    pngquant \
-    libxml2-dev \
-    libxslt-dev \
-    zlib-dev \
-    libffi-dev \
-    leptonica-dev \
-    binutils \
+  tesseract-ocr \
+  unpaper \
+  pngquant \
+  libxml2-dev \
+  libxslt-dev \
+  zlib-dev \
+  libffi-dev \
+  leptonica-dev \
+  binutils \
   && pip3 install --upgrade pip \
   # Install pybind11 for pikepdf
   && pip3 install pybind11 \
@@ -34,8 +34,8 @@ RUN \
   && pip3 install flask \
   # Add build dependencies
   && apk add --virtual build-dependencies \
-    build-base \
-    git
+  build-base \
+  git
 
 COPY . /app
 
@@ -55,22 +55,22 @@ RUN \
   >> /etc/apk/repositories \
   # Add runtime dependencies
   && apk add --update \
-    python3 \
-    jbig2enc@testing \
-    ghostscript \
+  python3 \
+  jbig2enc@testing \
+  ghostscript \
   qpdf@community \
   qpdf-dev@community \
-    tesseract-ocr \
-    tesseract-ocr-data-deu \
-    tesseract-ocr-data-chi_sim \
-    unpaper \
-    pngquant \
-    libxml2 \
-    libxslt \
-    zlib \
-    libffi \
-    leptonica-dev \
-    binutils \
+  tesseract-ocr \
+  tesseract-ocr-data-deu \
+  tesseract-ocr-data-chi_sim \
+  unpaper \
+  pngquant \
+  libxml2 \
+  libxslt \
+  zlib \
+  libffi \
+  leptonica-dev \
+  binutils \
   && mkdir /app
 
 WORKDIR /app
@@ -87,7 +87,7 @@ COPY --from=builder /app/setup.cfg /app/setup.py /app/README.md /app/
 COPY --from=builder /app/requirements /app/requirements
 COPY --from=builder /app/tests /app/tests
 COPY --from=builder /app/src /app/src
-# Copy PKG-INFO from build artifact in app dir to make setuptools-scm happy
-RUN cp /usr/lib/python3.6/site-packages/ocrmypdf-*.egg-info/PKG-INFO /app
+
+WORKDIR /data
 
 ENTRYPOINT ["/usr/bin/ocrmypdf"]