Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add docker arg for base image and change labels #45

Merged
merged 6 commits into from
Oct 28, 2024
Merged

Add docker arg for base image and change labels #45

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b3d9b6
Add docker arg for base image and change labels
joschrew Oct 25, 2024
6a7f3d1
Use ocrd-cuda-torch as docker base image in make
joschrew Oct 28, 2024
1657596
Put docker-labels back in
joschrew Oct 28, 2024
6726c3b
add CD
bertsky Oct 28, 2024
de3cf85
CD: fix typo
bertsky Oct 28, 2024
d81cd10
CD: rename workflow
bertsky Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions Dockerfile
View file
Open in desktop
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 unixprog@gmail.com
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 \
joschrew marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
joschrew marked this conversation as resolved.
Show resolved Hide resolved


# 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
Loading