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 65c9a07dde.

[ci skip]
This commit is contained in:
James R. Barlow
2017-03-10 22:49:08 -08:00
parent 0ccf564f03
commit 42547f6017
4 changed files with 6 additions and 8 deletions
+1 -1
View File
@@ -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"]
+1 -1
View File
@@ -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"]
ENTRYPOINT ["/application/docker-wrapper.sh"]
+1 -1
View File
@@ -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"]
+3 -5
View File
@@ -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