From 1b082f072158bc2d044deea9bd4fc90e02321af8 Mon Sep 17 00:00:00 2001
From: Robert Sachunsky <sachunsky@informatik.uni-leipzig.de>
Date: Sun, 17 Nov 2019 12:26:02 +0100
Subject: [PATCH] docker: rebase on ocrd/core, no fixed entrypoint

---
 Dockerfile | 15 ++++++++++-----
 Makefile   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b563e18..6cf94df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 && \
     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
 
-ENTRYPOINT ["/usr/local/bin/ocrd-im6convert"]
+# no fixed entrypoint (e.g. also allow `convert` etc)
+CMD ["/usr/local/bin/ocrd-im6convert", "--help"]
diff --git a/Makefile b/Makefile
index dd5561b..e38ec03 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ help:
 
 # Install system packages (for use with containers)
 deps-ubuntu:
-	apt-get install imagemagick
+	apt-get -y install imagemagick
 
 # Install python packages
 deps: