Skip to content

make docker: allow overriding $(DOCKER) command (e.g. podman) #220

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

make docker: allow overriding $(DOCKER) command (e.g. podman) #220

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4062c3e
make docker: allow overriding $(DOCKER) command (e.g. podman)
kba Apr 18, 2025
24c3ecf
.dockerignore repo/assets
kba Apr 18, 2025
8c80c07
docker: use latest core image
bertsky Apr 30, 2025
ae23021
TESSERACT_CONFIG: unset NDEBUG
bertsky Apr 30, 2025
c711543
docker: prepackage ocrd-all-module-dir.json
bertsky Apr 30, 2025
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
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
test/
dist/
build/
repo/assets
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export

SHELL = /bin/bash
PYTHON = python3
DOCKER = docker
PIP = pip3
GIT_SUBMODULE = git submodule
LOG_LEVEL = INFO
Expand Down Expand Up @@ -102,7 +103,7 @@ deps-test:

# Build docker image
docker: repo/tesseract repo/tesserocr
docker build \
$(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") \
Expand Down