From 42547f601756393e5538225e28fc1c8b5ea59585 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Fri, 10 Mar 2017 22:46:13 -0800 Subject: [PATCH] Revert "Finalize Dockerfile move; unfortunately not supported by Docker Hub" Unfortunately because of this issue https://github.com/docker/hub-feedback/issues/292 Docker Hub effectively automatically changes directory to the location of Dockerfile, meaning needed files are not in the right places, so this has to be reverted. This reverts commit 65c9a07ddedb021b317383cfc1d8dc156869c92b. [ci skip] --- Dockerfile | 2 +- Dockerfile.polyglot | 2 +- Dockerfile.tess4 | 2 +- MANIFEST.in | 8 +++----- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index d46de597..d4ae7981 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,4 +51,4 @@ WORKDIR /home/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"] +ENTRYPOINT ["/application/docker-wrapper.sh"] diff --git a/Dockerfile.polyglot b/Dockerfile.polyglot index 1180a5ac..f5accb4f 100644 --- a/Dockerfile.polyglot +++ b/Dockerfile.polyglot @@ -16,4 +16,4 @@ 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"] \ No newline at end of file +ENTRYPOINT ["/application/docker-wrapper.sh"] \ No newline at end of file diff --git a/Dockerfile.tess4 b/Dockerfile.tess4 index 91215fe7..68280554 100644 --- a/Dockerfile.tess4 +++ b/Dockerfile.tess4 @@ -61,4 +61,4 @@ WORKDIR /home/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"] +ENTRYPOINT ["/application/docker-wrapper.sh"] diff --git a/MANIFEST.in b/MANIFEST.in index 0aed7dd3..8f3cdf7f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,11 +7,9 @@ include dev_requirements.txt include .git_archival.txt # docker +include Dockerfile +include Dockerfile.polyglot include .dockerignore -include .docker/main.docker -include .docker/polyglot.docker -include .docker/tess4.docker -include .docker/docker-wrapper.sh # tests include pytest.ini @@ -45,6 +43,6 @@ exclude tasks.py recursive-include ocrmypdf *.py exclude ocrmypdf/lib/_leptonica.py include OCRmyPDF.sh - +include docker-wrapper.sh