Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: rebase on ocrd/core, no fixed entrypoint #9

Merged
merged 1 commit into from
Nov 29, 2019
Merged

docker: rebase on ocrd/core, no fixed entrypoint #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
FROM ocrd/core:edge
FROM ocrd/core
MAINTAINER OCR-D
ENV DEBIAN_FRONTEND noninteractive

ENV PREFIX=/usr/local

WORKDIR /build
COPY ocrd-im6convert .
COPY ocrd-tool.json .
COPY Makefile .

RUN apt-get update && \
apt-get -y install apt-utils && \
kba marked this conversation as resolved.
Show resolved Hide resolved
apt-get -y install --no-install-recommends \
ca-certificates \
make \
imagemagick
make

RUN make deps-ubuntu install

RUN make install PREFIX=/usr/local
ENV DEBIAN_FRONTEND teletype
kba marked this conversation as resolved.
Show resolved Hide resolved

ENTRYPOINT ["/usr/local/bin/ocrd-im6convert"]
# no fixed entrypoint (e.g. also allow `convert` etc)
CMD ["/usr/local/bin/ocrd-im6convert", "--help"]
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ help:

# Install system packages (for use with containers)
deps-ubuntu:
apt-get install imagemagick
apt-get -y install imagemagick
kba marked this conversation as resolved.
Show resolved Hide resolved

# Install python packages
deps:
Expand Down