From 43cc303100d219dbdc4545fd94f5378d8430ef51 Mon Sep 17 00:00:00 2001 From: "Gerber, Mike" Date: Fri, 5 Feb 2021 14:15:04 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=F0=9F=8F=BE=E2=80=8D=E2=99=82?= =?UTF-8?q?=EF=B8=8F=20Use=20ocrd=5Ffileformat#28=20for=20now?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-ocrd_fileformat | 7 +++++-- Dockerfile-ocrd_tesserocr | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile-ocrd_fileformat b/Dockerfile-ocrd_fileformat index 6d239d1..978531a 100644 --- a/Dockerfile-ocrd_fileformat +++ b/Dockerfile-ocrd_fileformat @@ -1,7 +1,7 @@ FROM my_ocrd_workflow-core ARG PIP_INSTALL="pip install --no-cache-dir" -ARG OCRD_FILEFORMAT_VERSION="0.2.0" +# XXX ARG OCRD_FILEFORMAT_VERSION="0.2.0" RUN apt-get update && \ @@ -12,8 +12,11 @@ RUN apt-get update && \ unzip \ && \ apt-get clean && rm -rf /var/lib/apt/lists/* -RUN git clone --depth 1 --branch v${OCRD_FILEFORMAT_VERSION} https://github.com/OCR-D/ocrd_fileformat.git && \ +# XXX pr +RUN git clone --depth 1 https://github.com/OCR-D/ocrd_fileformat.git && \ cd ocrd_fileformat/ && \ + git fetch origin pull/28/head:pr-28 && \ + git checkout pr-28 && \ git submodule update --init && \ make install-fileformat install PREFIX=/usr/local && \ cd .. && rm -rf ocrd_fileformat/ diff --git a/Dockerfile-ocrd_tesserocr b/Dockerfile-ocrd_tesserocr index b95ab2a..4ebcb82 100644 --- a/Dockerfile-ocrd_tesserocr +++ b/Dockerfile-ocrd_tesserocr @@ -24,7 +24,7 @@ RUN curl -sSL -O https://ub-backup.bib.uni-mannheim.de/~stweil/ocrd-train/data/F # Build pip installable stuff RUN ${PIP_INSTALL} \ - 'ocrd_tesserocr == 0.9.2' # XXX https://github.com/OCR-D/ocrd_tesserocr/issues/160 + 'ocrd_tesserocr == 0.11.0' # Check pip dependencies