Skip to content

Commit

Permalink
docker: base on ocrd/core-cuda:2.69 (via env var)
Browse files Browse the repository at this point in the history
  • Loading branch information
bertsky committed Oct 1, 2024
1 parent ea79b2a commit ed76e24
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ocrd/core-cuda:v2.62.0 AS base
ARG DOCKER_BASE_IMAGE
FROM $DOCKER_BASE_IMAGE
ARG VCS_REF
ARG BUILD_DATE
LABEL \
Expand All @@ -8,7 +9,7 @@ LABEL \
org.label-schema.build-date=$BUILD_DATE

SHELL ["/bin/bash", "-c"]
WORKDIR /build
WORKDIR /build/ocrd_keraslm

COPY setup.py .
COPY ocrd-tool.json .
Expand All @@ -23,7 +24,7 @@ RUN pip install imageio==2.14.1 "tifffile<2022"
# - preempt conflict over numpy between h5py and tensorflow
RUN pip install "numpy<1.24"
RUN pip install .
RUN rm -fr /build
RUN rm -fr /build/ocrd_keraslm

WORKDIR /data
VOLUME ["/data"]
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
SHELL = /bin/bash
PYTHON ?= python
PIP ?= pip
TAG ?= ocrd/keraslm
DOCKER_BASE_IMAGE ?= docker.io/ocrd/core-cuda:v2.69.0
DOCKER_TAG ?= ocrd/keraslm

# BEGIN-EVAL makefile-parser --make-help Makefile

Expand Down Expand Up @@ -56,7 +57,8 @@ install:

docker:
docker build \
-t $(TAG) \
-t $(DOCKER_TAG) \
--build-arg DOCKER_BASE_IMAGE=$(DOCKER_BASE_IMAGE) \
--build-arg VCS_REF=$(git rev-parse --short HEAD) \
--build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") .

Expand Down Expand Up @@ -87,4 +89,4 @@ repo/assets: always-update
clean:
$(RM) -r test/assets model_dta_test.h5

.PHONY: help deps deps-test install test clean always-update nvidia-tensorflow
.PHONY: help deps deps-test install test clean docker always-update nvidia-tensorflow
2 changes: 1 addition & 1 deletion repo/assets
Submodule assets updated 90 files
+1 −1 .circleci/config.yml
+4 −4 Makefile
+1 −1 data/SBB0000F29300010000/bag-info.txt
+4 −7 data/SBB0000F29300010000/data/OCR-D-GT-PAGE/FILE_0001_FULLTEXT.xml
+4 −7 data/SBB0000F29300010000/data/OCR-D-GT-PAGE/FILE_0002_FULLTEXT.xml
+29 −29 data/SBB0000F29300010000/data/mets.xml
+3 −3 data/SBB0000F29300010000/manifest-sha512.txt
+2 −2 data/SBB0000F29300010000/tagmanifest-sha512.txt
+1 −1 data/gutachten/bag-info.txt
+0 −5 data/gutachten/data/mets.xml
+1 −1 data/gutachten/manifest-sha512.txt
+2 −2 data/gutachten/tagmanifest-sha512.txt
+1 −1 data/kant_aufklaerung_1784-binarized/bag-info.txt
+9 −9 data/kant_aufklaerung_1784-binarized/data/mets.xml
+1 −1 data/kant_aufklaerung_1784-binarized/manifest-sha512.txt
+2 −2 data/kant_aufklaerung_1784-binarized/tagmanifest-sha512.txt
+1 −1 data/kant_aufklaerung_1784-jp2/bag-info.txt
+2 −2 data/kant_aufklaerung_1784-jp2/data/mets.xml
+1 −1 data/kant_aufklaerung_1784-jp2/manifest-sha512.txt
+2 −2 data/kant_aufklaerung_1784-jp2/tagmanifest-sha512.txt
+1 −1 data/kant_aufklaerung_1784-page-region-line-word_glyph/bag-info.txt
+0 −1,428 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-PAGE/PAGE_0017_PAGE.xml
+0 −2,134 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-PAGE/PAGE_0020_PAGE.xml
+0 −1,428 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-LINE/OCR-D-GT-SEG-LINE_0001.xml
+0 −2,134 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-LINE/OCR-D-GT-SEG-LINE_0002.xml
+0 −1,428 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0001.xml
+0 −2,134 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0002.xml
+0 −1,428 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0001.xml
+0 −2,134 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0002.xml
+0 −4,121 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-WORD/OCR-D-GT-SEG-WORD_0001.xml
+0 −6,862 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-WORD/OCR-D-GT-SEG-WORD_0002.xml
+2 −2 ..._aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-WORD_GLYPH/OCR-D-GT-SEG-WORD_GLYPH_0001.xml
+2 −2 ..._aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-GT-SEG-WORD_GLYPH/OCR-D-GT-SEG-WORD_GLYPH_0002.xml
+ data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-IMG/OCR-D-IMG_0001.tif
+ data/kant_aufklaerung_1784-page-region-line-word_glyph/data/OCR-D-IMG/OCR-D-IMG_0002.tif
+16 −16 data/kant_aufklaerung_1784-page-region-line-word_glyph/data/mets.xml
+5 −15 data/kant_aufklaerung_1784-page-region-line-word_glyph/manifest-sha512.txt
+2 −2 data/kant_aufklaerung_1784-page-region-line-word_glyph/tagmanifest-sha512.txt
+1 −1 data/kant_aufklaerung_1784-page-region/bag-info.txt
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0001.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0002.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0003.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0004.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0005.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0006.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0007.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0008.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0009.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0010.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0011.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0012.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0013.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0014.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0015.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0016.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0017.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0018.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0019.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-PAGE/OCR-D-GT-SEG-PAGE_0020.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0001.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0002.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0003.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0004.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0005.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0006.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0007.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0008.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0009.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0010.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0011.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0012.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0013.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0014.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0015.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0016.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0017.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0018.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0019.xml
+1 −1 data/kant_aufklaerung_1784-page-region/data/OCR-D-GT-SEG-REGION/OCR-D-GT-SEG-REGION_0020.xml
+60 −60 data/kant_aufklaerung_1784-page-region/data/mets.xml
+41 −41 data/kant_aufklaerung_1784-page-region/manifest-sha512.txt
+2 −2 data/kant_aufklaerung_1784-page-region/tagmanifest-sha512.txt
+1 −1 data/kant_aufklaerung_1784/bag-info.txt
+6 −6 data/kant_aufklaerung_1784/data/mets.xml
+1 −1 data/kant_aufklaerung_1784/manifest-sha512.txt
+2 −2 data/kant_aufklaerung_1784/tagmanifest-sha512.txt
+1 −1 data/pembroke_werke_1766/bag-info.txt
+1 −1 data/pembroke_werke_1766/data/mets.xml
+1 −1 data/pembroke_werke_1766/manifest-sha512.txt
+2 −2 data/pembroke_werke_1766/tagmanifest-sha512.txt

0 comments on commit ed76e24

Please sign in to comment.