update docker: base on 19.10

OCR-D · Oct 18, 2019 · 3b21017 · 3b21017
1 parent 9e05d7f
commit 3b21017
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:19.10
 MAINTAINER OCR-D
 ENV DEBIAN_FRONTEND noninteractive
 ENV PYTHONIOENCODING utf8
@@ -10,6 +10,7 @@ COPY ocrd ./ocrd
 COPY ocrd_modelfactory ./ocrd_modelfactory/
 COPY ocrd_models ./ocrd_models
 COPY ocrd_utils ./ocrd_utils
+COPY ocrd_validators/ ./ocrd_validators
 COPY Makefile .
 COPY README.md .
 COPY LICENSE .
@@ -19,12 +20,12 @@ RUN apt-get update && \
     make \
     sudo \
     git \
-    libglib2.0.0 \
-    libxext6
+    libglib2.0.0
+    # libxext6
     # libsm6 \
     # libxrender1 \
 RUN make deps-ubuntu
 RUN pip3 install --upgrade pip
-RUN make deps install
+RUN make deps-ubuntu install
 
 ENTRYPOINT ["/usr/local/bin/ocrd"]
diff --git a/Makefile b/Makefile
@@ -61,7 +61,7 @@ PIP_INSTALL = pip install
 
 # Dependencies for deployment in an ubuntu/debian linux
 deps-ubuntu:
-	sudo apt install -y python3 python3-pip
+	sudo apt-get install -y python3 python3-pip
 
 # Install test python deps via pip
 deps-test: