Skip to content

Commit

Permalink
Add docker arg for base image and change labels
Browse files Browse the repository at this point in the history
  • Loading branch information
joschrew committed Oct 25, 2024
1 parent a6160ce commit 6b3d9b6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 18 deletions.
23 changes: 7 additions & 16 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
FROM ocrd/core-cuda
ARG DOCKER_BASE_IMAGE
FROM $DOCKER_BASE_IMAGE
ARG VCS_REF
ARG BUILD_DATE
MAINTAINER [email protected]
LABEL maintainer="https://ocr-d.de"
LABEL org.label-schema.vendor="DFG-Funded Initiative for Optical Character Recognition Development"
LABEL org.label-schema.name="ocrd_kraken"
LABEL org.label-schema.vcs-ref=$VCS_REF
LABEL org.label-schema.vcs-url="https://github.com/OCR-D/ocrd_kraken"
LABEL org.label-schema.build-date=$BUILD_DATE
LABEL org.opencontainers.image.vendor="DFG-Funded Initiative for Optical Character Recognition Development"
LABEL org.opencontainers.image.title="ocrd_kraken"
LABEL org.opencontainers.image.description="Kraken bindings"
LABEL org.opencontainers.image.source="https://github.com/OCR-D/ocrd_kraken"
LABEL org.opencontainers.image.documentation="https://github.com/OCR-D/ocrd_kraken/blob/${VCS_REF}/README.md"
LABEL org.opencontainers.image.revision=$VCS_REF
LABEL org.opencontainers.image.created=$BUILD_DATE
LABEL org.opencontainers.image.base.name=ocrd/core-cuda
LABEL \
maintainer="https://ocr-d.de/kontakt" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url="https://github.com/OCR-D/ocrd_kraken" \
org.label-schema.build-date=$BUILD_DATE

ENV DEBIAN_FRONTEND noninteractive
ENV PYTHONIOENCODING utf8
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ PYTHONIOENCODING=utf8

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


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

Expand Down Expand Up @@ -62,8 +64,9 @@ build:
# Build docker image
docker:
docker build \
--build-arg VCS_REF=$$(git rev-parse --short HEAD) \
--build-arg BUILD_DATE=$$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--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) .

# Run test
Expand Down

0 comments on commit 6b3d9b6

Please sign in to comment.