From d700c568ac6f015622b3e2cc4f07b0bbc543f1dd Mon Sep 17 00:00:00 2001 From: "Gerber, Mike" Date: Mon, 15 Feb 2021 16:29:58 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=91=B7=F0=9F=8F=BE=E2=80=8D?= =?UTF-8?q?=E2=99=82=EF=B8=8F=20Use=20ocrd=5Ffileformat#28=20for=20now"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 43cc303100d219dbdc4545fd94f5378d8430ef51. --- Dockerfile-ocrd_fileformat | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile-ocrd_fileformat b/Dockerfile-ocrd_fileformat index c89dbec..ec83255 100644 --- a/Dockerfile-ocrd_fileformat +++ b/Dockerfile-ocrd_fileformat @@ -2,7 +2,7 @@ ARG DRONE_COMMIT="latest" FROM quratorspk/ocrd-galley-core:$DRONE_COMMIT ARG PIP_INSTALL="pip install --no-cache-dir" -# XXX ARG OCRD_FILEFORMAT_VERSION="0.2.0" +ARG OCRD_FILEFORMAT_VERSION="0.2.0" RUN apt-get update && \ @@ -13,11 +13,8 @@ RUN apt-get update && \ unzip \ && \ apt-get clean && rm -rf /var/lib/apt/lists/* -# XXX pr -RUN git clone --depth 1 https://github.com/OCR-D/ocrd_fileformat.git && \ +RUN git clone --depth 1 --branch v${OCRD_FILEFORMAT_VERSION} 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/