From 9c7c104dcec89663a4ddab0e83334db79a639184 Mon Sep 17 00:00:00 2001
From: joschrew <91774427+joschrew@users.noreply.github.com>
Date: Wed, 2 Oct 2024 15:29:36 +0200
Subject: [PATCH 1/3] Add Dockerfile and Makefile to create ocr-d image

---
 Dockerfile     | 22 ++++++++++++++++++++++
 Makefile       | 26 ++++++++++++++++++++++++++
 pyproject.toml |  2 +-
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile
 create mode 100644 Makefile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a66d718
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,22 @@
+ARG DOCKER_BASE_IMAGE
+FROM $DOCKER_BASE_IMAGE
+ARG VCS_REF
+ARG BUILD_DATE
+LABEL \
+    maintainer="https://ocr-d.de/kontakt" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url="https://github.com/qurator-spk/dinglehopper" \
+    org.label-schema.build-date=$BUILD_DATE
+
+WORKDIR /build/dinglehopper
+COPY pyproject.toml .
+COPY src/dinglehopper/ocrd-tool.json .
+COPY src ./src
+COPY requirements.txt .
+COPY README.md .
+COPY Makefile .
+RUN make install
+RUN rm -rf /build/dinglehopper
+
+WORKDIR /data
+VOLUME ["/data"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..babaf5f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,26 @@
+PYTHON = python3
+PIP = pip3
+PYTHONIOENCODING=utf8
+
+DOCKER_BASE_IMAGE = docker.io/ocrd/core:v2.69.0
+DOCKER_TAG = ocrd/dinglehopper
+
+help:
+	@echo
+	@echo "  Targets"
+	@echo
+	@echo "    install Install full Python package via pip"
+	@echo "    docker  Build the ocrd/dinglehopper docker image"
+
+# Install Python package via pip
+install:
+	$(PIP) install .
+
+docker:
+	docker build \
+	--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") \
+	-t $(DOCKER_TAG) .
+
+.PHONY: help install docker
diff --git a/pyproject.toml b/pyproject.toml
index 62bac78..a94e0b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,7 @@ optional-dependencies.dev = {file = ["requirements-dev.txt"]}
 where = ["src"]
 
 [tool.setuptools.package-data]
-dinglehopper = ["templates/*"]
+dinglehopper = ["templates/*", "*.json"]
 
 
 [tool.pytest.ini_options]

From 6ecf49a355eb2f413a38552ca8187ab794b98d3f Mon Sep 17 00:00:00 2001
From: Mike Gerber <mike.gerber@sbb.spk-berlin.de>
Date: Mon, 7 Oct 2024 17:39:42 +0200
Subject: [PATCH 2/3] Update Dockerfile

Co-authored-by: Robert Sachunsky <38561704+bertsky@users.noreply.github.com>
---
 Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a66d718..a7bda6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,11 @@ FROM $DOCKER_BASE_IMAGE
 ARG VCS_REF
 ARG BUILD_DATE
 LABEL \
-    maintainer="https://ocr-d.de/kontakt" \
+LABEL \
+    maintainer="https://github.com/qurator-spk/dinglehopper/issues" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url="https://github.com/qurator-spk/dinglehopper" \
+    org.label-schema.build-date=$BUILD_DATE
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/qurator-spk/dinglehopper" \
     org.label-schema.build-date=$BUILD_DATE

From 6b82293670ea7b642d65e7114a9a4d0c8897a619 Mon Sep 17 00:00:00 2001
From: Mike Gerber <mike.gerber@sbb.spk-berlin.de>
Date: Mon, 7 Oct 2024 17:41:59 +0200
Subject: [PATCH 3/3] Update Dockerfile

I fancy-clicked @bertsky's change suggestion, which duplicated some labels. Now fancy-clicking the fix, fingers crossed...
---
 Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a7bda6f..04e7330 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,15 +2,11 @@ ARG DOCKER_BASE_IMAGE
 FROM $DOCKER_BASE_IMAGE
 ARG VCS_REF
 ARG BUILD_DATE
-LABEL \
 LABEL \
     maintainer="https://github.com/qurator-spk/dinglehopper/issues" \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/qurator-spk/dinglehopper" \
     org.label-schema.build-date=$BUILD_DATE
-    org.label-schema.vcs-ref=$VCS_REF \
-    org.label-schema.vcs-url="https://github.com/qurator-spk/dinglehopper" \
-    org.label-schema.build-date=$BUILD_DATE
 
 WORKDIR /build/dinglehopper
 COPY pyproject.toml .