Skip to content

Commit

Permalink
Revert "Finalize Dockerfile move; unfortunately not supported by Dock…
Browse files Browse the repository at this point in the history
…er Hub"

Unfortunately because of this issue
docker/hub-feedback#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 65c9a07.

[ci skip]
  • Loading branch information
James R. Barlow committed Mar 11, 2017
1 parent 0ccf564 commit 42547f6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion Dockerfile.polyglot
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion Dockerfile.tess4
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
8 changes: 3 additions & 5 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -45,6 +43,6 @@ exclude tasks.py
recursive-include ocrmypdf *.py
exclude ocrmypdf/lib/_leptonica.py
include OCRmyPDF.sh

include docker-wrapper.sh


0 comments on commit 42547f6

Please sign in to comment.