Skip to content

Commit 6b3d9b6

Browse files
committed
Add docker arg for base image and change labels
1 parent a6160ce commit 6b3d9b6

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

Dockerfile

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
1-
FROM ocrd/core-cuda
1+
ARG DOCKER_BASE_IMAGE
2+
FROM $DOCKER_BASE_IMAGE
23
ARG VCS_REF
34
ARG BUILD_DATE
4-
MAINTAINER unixprog@gmail.com
5-
LABEL maintainer="https://ocr-d.de"
6-
LABEL org.label-schema.vendor="DFG-Funded Initiative for Optical Character Recognition Development"
7-
LABEL org.label-schema.name="ocrd_kraken"
8-
LABEL org.label-schema.vcs-ref=$VCS_REF
9-
LABEL org.label-schema.vcs-url="https://github.com/OCR-D/ocrd_kraken"
10-
LABEL org.label-schema.build-date=$BUILD_DATE
11-
LABEL org.opencontainers.image.vendor="DFG-Funded Initiative for Optical Character Recognition Development"
12-
LABEL org.opencontainers.image.title="ocrd_kraken"
13-
LABEL org.opencontainers.image.description="Kraken bindings"
14-
LABEL org.opencontainers.image.source="https://github.com/OCR-D/ocrd_kraken"
15-
LABEL org.opencontainers.image.documentation="https://github.com/OCR-D/ocrd_kraken/blob/${VCS_REF}/README.md"
16-
LABEL org.opencontainers.image.revision=$VCS_REF
17-
LABEL org.opencontainers.image.created=$BUILD_DATE
18-
LABEL org.opencontainers.image.base.name=ocrd/core-cuda
5+
LABEL \
6+
maintainer="https://ocr-d.de/kontakt" \
7+
org.label-schema.vcs-ref=$VCS_REF \
8+
org.label-schema.vcs-url="https://github.com/OCR-D/ocrd_kraken" \
9+
org.label-schema.build-date=$BUILD_DATE
1910

2011
ENV DEBIAN_FRONTEND noninteractive
2112
ENV PYTHONIOENCODING utf8

Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ PYTHONIOENCODING=utf8
88

99
# Docker container tag ("$(DOCKER_TAG)")
1010
DOCKER_TAG = 'ocrd/kraken'
11+
DOCKER_BASE_IMAGE = docker.io/ocrd/core-cuda:v2.70.0
12+
1113

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

@@ -62,8 +64,9 @@ build:
6264
# Build docker image
6365
docker:
6466
docker build \
65-
--build-arg VCS_REF=$$(git rev-parse --short HEAD) \
66-
--build-arg BUILD_DATE=$$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
67+
--build-arg DOCKER_BASE_IMAGE=$(DOCKER_BASE_IMAGE) \
68+
--build-arg VCS_REF=$$(git rev-parse --short HEAD) \
69+
--build-arg BUILD_DATE=$$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
6770
-t $(DOCKER_TAG) .
6871

6972
# Run test

0 commit comments

Comments
 (0)