Skip to content

Commit

Permalink
Merge pull request OCR-D#40 from kba/label-images
Browse files Browse the repository at this point in the history
LABEL the image with git rev, build date, maintainer, microbadger bad…
  • Loading branch information
kba authored Jan 9, 2020
2 parents 65e1f55 + 7e1b1a4 commit f5fc4bf
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
docker push ocrd/all:minimum-git
docker push ocrd/all:medium-git
docker push ocrd/all:maximum-git
curl -X POST "$MICROBADGER_WEBHOOK" || true
workflows:
version: 2
build-master:
Expand Down
9 changes: 8 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@
# use OCR-D base container (from ubuntu:18.04)
FROM ocrd/core

MAINTAINER OCR-D
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/OCR-D/ocrd_all" \
org.label-schema.build-date=$BUILD_DATE


ENV PREFIX=/usr/local
ENV VIRTUAL_ENV $PREFIX
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,8 @@ docker-maximum docker-maximum-git: DOCKER_MODULES = $(OCRD_MODULES)
# (maybe we should add --network=host here for smoother build-time?)
docker%: Dockerfile $(DOCKER_MODULES)
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 OCRD_MODULES="$(DOCKER_MODULES)" \
--build-arg PIP_OPTIONS="$(PIP_OPTIONS)" \
-t $(DOCKER_TAG):$(or $(*:-%=%),latest) .
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# OCR-D/ocrd_all

[![Built on CircleCI](https://circleci.com/gh/OCR-D/ocrd_all.svg?style=svg)](https://circleci.com/gh/OCR-D/ocrd_all)
![Docker Automated build](https://img.shields.io/docker/automated/ocrd/all)
[![MIT licensed](https://img.shields.io/github/license/OCR-D/ocrd_all)](https://github.com/OCR-D/ocrd_all/blob/master/LICENSE)
[![](https://images.microbadger.com/badges/image/ocrd/all:maximum.svg)](https://hub.docker.com/r/ocrd/all)

This controls installation of all OCR-D modules from source (as git submodules).

Expand Down

0 comments on commit f5fc4bf

Please sign in to comment.