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

Rename dozzle logview #59

Merged
merged 4 commits into from
Dec 1, 2022
Merged

Rename dozzle logview #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
793c378
update Manager (renamed dozzle→logview)
bertsky Nov 30, 2022
c758d3e
have internal Controller use separate /data volume
bertsky Nov 30, 2022
e1c1410
add some comments
bertsky Nov 30, 2022
22c6835
Merge branch 'main' into rename-dozzle-logview
markusweigelt Dec 1, 2022
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CONTROLLER_ENV_UID=1001 # user id of SSH user (`id -u` when using `make`)
CONTROLLER_ENV_GID=1001 # group id of SSH user (`id -g` when using `make`)
CONTROLLER_ENV_UMASK=0002 # SSH user specific permission mask
CONTROLLER_KEYS=${PWD}/ocrd/controller/.ssh/authorized_keys # file path with public SSH keys of users allowed to log in
CONTROLLER_DATA=${PWD}/kitodo/data/metadata # persistent data volume to mount
CONTROLLER_DATA=${PWD}/ocrd/controller/data # persistent data volume to mount
CONTROLLER_MODELS=${PWD}/ocrd/controller/models # path to persistent models (in `ocrd-resources/`)
CONTROLLER_CONFIG=${PWD}/ocrd/controller/config # path to persistent config (in `ocrd/resources.yml`)
CONTROLLER_WORKERS=1 # number of workers for processing
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 @@ -111,6 +111,8 @@ status:
docker compose ps

test test-production test-presentation clean-testdata: NETWORK=ocrd_kitodo_default
# if there is no shell override for MANAGER_DATA, then get it from the .env
# (we must download testdata here, the path must match the currently mounted volume)
test test-production test-presentation clean-testdata: DATA=$(or $(MANAGER_DATA),$(shell eval echo `sed -n s/^MANAGER_DATA=//p .env`))
test test-production test-presentation clean-testdata:
$(MAKE) -C _modules/ocrd_manager $@
Expand All @@ -124,9 +126,10 @@ Targets:
- down: `docker compose down` all containers (i.e. stop and remove)
- stop: `docker compose stop` all containers (i.e. only stop)
- config: dump all the composed files
- status: list running containers
- status: `docker compose ps` all running containers
- test: run an example workflow on example data on running containers
- clean: remove files created by prepare and test
- clean-testdata: remove files created by `test`
- clean: remove files created by `prepare` and `test`

Variables:
- CONTROLLER_ENV_UID user id to use on the OCR-D Controller (default: $(CONTROLLER_ENV_UID))
Expand Down
2 changes: 1 addition & 1 deletion _modules/ocrd_manager
Open in desktop
Submodule ocrd_manager updated 3 files
+1 −1 Makefile
+26 −9 README.md
+1 −1 ocrd_monitor/docker-compose.yml
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ services:
file: _modules/ocrd_manager/ocrd_monitor/docker-compose.yml
service: ocrd-monitor

dozzle:
ocrd-logview:
extends:
file: _modules/ocrd_manager/ocrd_monitor/docker-compose.yml
service: dozzle
service: ocrd-logview

# OCR-D Controller

Expand Down