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.

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

Workflows volume #74

Merged
merged 3 commits into from
Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .env
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ MANAGER_ENV_UMASK=0002 # ssh user specific permission mask
MANAGER_KEYS=${PWD}/ocrd/manager/.ssh/authorized_keys # file path with public SSH keys of users allowed to log in
MANAGER_KEY=${PWD}/ocrd/manager/.ssh/id_rsa # file path with private SSH key of internal `ocrd` user (should match one of `CONTROLLER_KEYS`)
MANAGER_DATA=${PWD}/kitodo/data/metadata # persistent data volume to mount
MANAGER_WORKFLOWS=${PWD}/kitodo/data/ocr_workflows # persistent volume for workflows

# Monitor Web server
MONITOR_IMAGE=ghcr.io/slub/ocrd_monitor:latest # name and tag of image
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ $(MANAGER_KEYS): $(APP_KEY)
./kitodo/overwrites/data: | ./kitodo/overwrites/
cp -r ./_resources/kitodo/data $@
mkdir -p $@/ocr_workflows/
cp ./_modules/ocrd_manager/ocr-workflow-default.sh $@/ocr_workflows/
cp ./_modules/ocrd_manager/workflows/* $@/ocr_workflows/
ifeq ($(findstring with-kitodo-production,$(COMPOSE_PROFILES)),)
@echo >&2 " You should now copy $@/scripts"
@echo >&2 " to your own Kitodo.Production instance"
Expand Down Expand Up @@ -157,8 +157,8 @@ pull:

status:
docker compose ps


$(APP_DATA)/metadata/testdata-kitodo:
mkdir -p $@/images
for page in {00000009..00000014}; do \
Expand Down
2 changes: 1 addition & 1 deletion _modules/ocrd_monitor
Submodule ocrd_monitor updated 50 files
+1 −1 .env.example
+16 −58 .github/workflows/publish.yml
+0 −59 .github/workflows/test-ci.yml
+0 −2 .gitignore
+4 −4 Dockerfile
+5 −0 Makefile
+4 −6 README.md
+1 −0 docker-compose.yml
+1 −1 init.sh
+9 −2 noxfile.py
+0 −4 ocrdbrowser/__init__.py
+21 −31 ocrdbrowser/_browser.py
+17 −26 ocrdbrowser/_docker.py
+13 −19 ocrdbrowser/_subprocess.py
+2 −16 ocrdbrowser/_websocketchannel.py
+19 −11 ocrdmonitor/ocrdcontroller.py
+13 −7 ocrdmonitor/ocrdjob.py
+11 −10 ocrdmonitor/processstatus.py
+10 −2 ocrdmonitor/server/jobs.py
+8 −3 ocrdmonitor/server/proxy.py
+4 −15 ocrdmonitor/server/settings.py
+14 −2 ocrdmonitor/server/templates/jobs.html.j2
+3 −13 ocrdmonitor/server/templates/workspace.html.j2
+29 −24 ocrdmonitor/server/workspaces.py
+31 −20 ocrdmonitor/sshps.py
+0 −985 pdm.lock
+0 −56 pyproject.toml
+1 −0 requirements.dev.txt
+1 −1 requirements.txt
+10 −0 tests/fakes/__init__.py
+0 −0 tests/fakes/_backgroundprocess.py
+13 −9 tests/fakes/_broadwayfake.py
+76 −0 tests/fakes/_ocrdbrowserfake.py
+71 −0 tests/ocrdbrowser/browserdoubles.py
+13 −24 tests/ocrdbrowser/test_launch.py
+4 −5 tests/ocrdbrowser/test_websocketchannel.py
+0 −1 tests/ocrdmonitor/conftest.py
+2 −14 tests/ocrdmonitor/server/fixtures.py
+4 −4 tests/ocrdmonitor/server/test_job_endpoint.py
+69 −39 tests/ocrdmonitor/server/test_settings.py
+48 −110 tests/ocrdmonitor/server/test_workspace_endpoint.py
+17 −42 tests/ocrdmonitor/sshcontainer.py
+17 −4 tests/ocrdmonitor/test_jobs.py
+1 −1 tests/ocrdmonitor/test_processstatus.py
+1 −1 tests/ocrdmonitor/test_redirect.py
+11 −19 tests/ocrdmonitor/test_sshps.py
+0 −22 tests/testdoubles/__init__.py
+0 −74 tests/testdoubles/_browserfactory.py
+0 −54 tests/testdoubles/_browserfake.py
+0 −96 tests/testdoubles/_browserspy.py