Reorganize .docker folder so we don't have to rebuild as much

.docker/alpine.dockerfile

@@ -75,12 +75,12 @@ RUN \
 
 WORKDIR /app
 
-# Copy build artifacts (python site-packages9
+# Copy build artifacts (python site-packages)
 COPY --from=builder /usr/lib/python3.6/site-packages /usr/lib/python3.6/site-packages
 COPY --from=builder /usr/bin/ocrmypdf /usr/bin/dumppdf.py /usr/bin/latin2ascii.py /usr/bin/pdf2txt.py /usr/bin/img2pdf /usr/bin/chardetect /usr/bin/
 
 # Copy
-COPY --from=builder /app/.docker/webservice.py /app/
+COPY --from=builder /app/misc/webservice.py /app/
 
 # Copy minimal project files to get the test suite.
 COPY --from=builder /app/setup.cfg /app/setup.py /app/README.md /app/

.docker/docker-wrapper.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. /appenv/bin/activate
-cd /home/docker
-exec ocrmypdf "$@"

.docker/polyglot.dockerfile

@@ -1,17 +0,0 @@
-# OCRmyPDF polyglot
-#
-FROM      jbarlow83/ocrmypdf:latest
-
-USER root
-
-# Update system and install our dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  tesseract-ocr-all 
-
-RUN apt-get autoremove -y && apt-get clean -y
-
-USER docker
-
-# Must use array form of ENTRYPOINT
-# Non-array form does not append other arguments, because that is "intuitive"
-ENTRYPOINT ["/application/.docker/docker-wrapper.sh"]

.docker/webservice.dockerfile

@@ -1,24 +0,0 @@
-# OCRmyPDF webservice
-#
-FROM      jbarlow83/ocrmypdf-polyglot:latest
-
-USER root
-
-# Update system and install our dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  python3-flask
-
-RUN apt-get autoremove -y && apt-get clean -y
-
-EXPOSE 5000
-
-COPY .docker/webservice.py /application
-
-USER docker
-
-VOLUME ["/config"]
-
-# This config file is optional
-ENV OCRMYPDF_WEBSERVICE_SETTINGS "/config/config.py"
-
-ENTRYPOINT ["python3", "/application/webservice.py"]

.dockerignore

@@ -6,7 +6,6 @@
 **/*.pyc
 .*/
 !.git/
-!.docker/
 .ruffus_history.sqlite
 bin/
 build/
@@ -17,6 +16,7 @@ include/
 lib/
 MANIFEST.in
 ocrmypdf.egg-info/
+private/
 staging/
 tests/cache/
 tests/output/