From a2d1d76dbdb0ca2207db31e67d6e7d7ce4c1c844 Mon Sep 17 00:00:00 2001 From: "Gerber, Mike" Date: Thu, 6 Feb 2020 13:52:05 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B3=20Docker:=20Do=20not=20use=20the?= =?UTF-8?q?=20make=20target=20to=20install=20calamari-ocr,=20stick=20to=20?= =?UTF-8?q?pip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 - Makefile | 9 --------- 2 files changed, 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index e00889c..d04c790 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,6 @@ COPY requirements.txt . COPY README.md . COPY ocrd_calamari ocrd_calamari -RUN make calamari/build RUN pip3 install --upgrade pip && \ pip3 install . diff --git a/Makefile b/Makefile index c3e85ab..c6752fa 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,7 @@ help: @echo " Targets" @echo "" @echo " install Install ocrd_calamari" - @echo " calamari Clone calamari repo" @echo " gt4histocr-calamari Get GT4HistOCR Calamari model (from SBB)" - @echo " calamari/build pip install calamari" @echo " deps-test Install testing python deps via pip" @echo " repo/assets Clone OCR-D/assets to ./repo/assets" @echo " test/assets Setup test assets" @@ -33,9 +31,6 @@ help: install: $(PIP_INSTALL) . -# Clone calamari repo -calamari: - $(GIT_CLONE) https://github.com/chwick/calamari gt4histocr-calamari: mkdir gt4histocr-calamari @@ -50,10 +45,6 @@ actevedef_718448162: unzip actevedef_718448162.zip -# pip install calamari -calamari/build: calamari - cd calamari && $(PIP_INSTALL) . - # # Assets and Tests