From 1c15b263ceec9b6d4b3c683765db1de845712648 Mon Sep 17 00:00:00 2001 From: markusweigelt Date: Mon, 19 Jun 2023 11:56:28 +0000 Subject: [PATCH 1/4] changes-for-release --- CHANGELOG.md | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e27e0e..b4383e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,124 @@ # Changelog +## [v20230619-stable](https://github.com/slub/ocrd_kitodo/releases/tag/v20230619-stable) + +### Integration of OCR-D and Kitodo + +* Release stable version v20230616-stable by @github-actions[bot] in https://github.com/slub/ocrd_kitodo/pull/84 +* Update stable release workflow by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/85 +* Fix stable release pr by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/83 +* Merge main branch into stable branch by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/82 +* Improve kitodo process ocr script to support workflow, script and lan… by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/80 +* Update submodules by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/79 +* Fix make test kitodo by @bertsky in https://github.com/slub/ocrd_kitodo/pull/77 +* Add changelog generation by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/72 +* Workflows volume by @bertsky in https://github.com/slub/ocrd_kitodo/pull/74 +* Update submodules by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/71 +* Add before startup script for ssh config for manager by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/69 +* Update makefile-ci.yml by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/66 +* Add make test-kitodo by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/63 +* Add make equivalent for docker compose pull by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/62 +* Update submodule and add monitor by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/61 +* Rename dozzle logview by @bertsky in https://github.com/slub/ocrd_kitodo/pull/59 +* Mkdocs material documentation by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/58 +* update to fixed Controller by @bertsky in https://github.com/slub/ocrd_kitodo/pull/57 +* rules and docs for external Production by @bertsky in https://github.com/slub/ocrd_kitodo/pull/56 +* Fix typo (found by codespell) by @stweil in https://github.com/slub/ocrd_kitodo/pull/55 +* Rename to ocrd_kitodo by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/53 +* Update publish.yml by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/52 +* Update ocrd-manager submodule by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/51 +* Update paths and submodules to transfered repo by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/50 +* Update repository paths and submodules by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/49 +* Add test by @bertsky in https://github.com/slub/ocrd_kitodo/pull/47 +* Extend sample data using seperate script for METS processing, Splits example data and necessary data of setup Makefile process by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/44 + +**Full Changelog**: [79bda3b2f33181d7f4fcd13f02b482f912078eef...9f9ca05613c29850b4391f1930c967e774b01b6b](https://github.com/slub/ocrd_kitodo/compare/79bda3b2f33181d7f4fcd13f02b482f912078eef...9f9ca05613c29850b4391f1930c967e774b01b6b) + +### OCR-D Controller + +* Revert CUDA count all by @bertsky in https://github.com/slub/ocrd_controller/pull/32 +* Dockerfile: add label-schema and OCI labels by @bertsky in https://github.com/slub/ocrd_controller/pull/31 +* docker-compose.yml: set device count: all explicitly by @bertsky in https://github.com/slub/ocrd_controller/pull/29 +* Provide default value for CONTROLLER_KEYS variable by @SvenMarcus in https://github.com/slub/ocrd_controller/pull/28 +* Defaults for volume source by @markusweigelt in https://github.com/slub/ocrd_controller/pull/27 +* Update publish.yml to build stable version by @markusweigelt in https://github.com/slub/ocrd_controller/pull/25 +* Separation of the host port assignment by @markusweigelt in https://github.com/slub/ocrd_controller/pull/23 +* add another image tag of stable version by @markusweigelt in https://github.com/slub/ocrd_controller/pull/22 +* Add fixed stable version of controller by @markusweigelt in https://github.com/slub/ocrd_controller/pull/21 +* Weekly update of controller image by @markusweigelt in https://github.com/slub/ocrd_controller/pull/20 +* docker-compose.yml: expose port by @bertsky in https://github.com/slub/ocrd_controller/pull/18 +* Fix some typos (found by codespell) by @stweil in https://github.com/slub/ocrd_controller/pull/15 +* Avoid error messages because of hard links by @stweil in https://github.com/slub/ocrd_controller/pull/17 +* Avoid error message because of existing directory by @stweil in https://github.com/slub/ocrd_controller/pull/16 +* remove workflow server branch by @bertsky in https://github.com/slub/ocrd_controller/pull/14 +* Update publish.yml by @markusweigelt in https://github.com/slub/ocrd_controller/pull/13 +* Create publish gh workflow by @markusweigelt in https://github.com/slub/ocrd_controller/pull/12 + +**Full Changelog**: [d3c0192d96bd4e75eadf27d19d9ba9b08297cf41...4b929615254859b7c03ba320a2ffee3989e9fa10](https://github.com/slub/ocrd_controller/compare/d3c0192d96bd4e75eadf27d19d9ba9b08297cf41...4b929615254859b7c03ba320a2ffee3989e9fa10) + +### OCR-D Manager + +* Send ocr processing messages to active mq by @markusweigelt in https://github.com/slub/ocrd_manager/pull/60 +* Dockerfile labels by @markusweigelt in https://github.com/slub/ocrd_manager/pull/58 +* test: improve error msg if container not running by @bertsky in https://github.com/slub/ocrd_manager/pull/59 +* Workflow volume by @bertsky in https://github.com/slub/ocrd_manager/pull/57 +* Add opencontainers by @markusweigelt in https://github.com/slub/ocrd_manager/pull/56 +* Test already exist by @markusweigelt in https://github.com/slub/ocrd_manager/pull/55 +* Adjustment of the workflow to publish the stable image version by @markusweigelt in https://github.com/slub/ocrd_manager/pull/54 +* adapt to new core / bash by @bertsky in https://github.com/slub/ocrd_manager/pull/53 +* pre_process_to_workdir: keep subdir by @bertsky in https://github.com/slub/ocrd_manager/pull/52 +* Dockerfile: symlink scripts by @bertsky in https://github.com/slub/ocrd_manager/pull/51 +* Replaces flask with fastapi monitor by @SvenMarcus in https://github.com/slub/ocrd_manager/pull/45 +* Improvements env file by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/1 +* rename dozzle → ocrd-logview by @bertsky in https://github.com/slub/ocrd_manager/pull/44 +* update test-presentation check and docs by @bertsky in https://github.com/slub/ocrd_manager/pull/43 +* CI: determine build args dynamically by @bertsky in https://github.com/slub/ocrd_manager/pull/41 +* expose SSH port by @bertsky in https://github.com/slub/ocrd_manager/pull/42 +* Update publish.yml by @markusweigelt in https://github.com/slub/ocrd_manager/pull/40 +* Change bertsky to slub by @markusweigelt in https://github.com/slub/ocrd_manager/pull/39 +* Update-to new repo location by @markusweigelt in https://github.com/slub/ocrd_manager/pull/37 +* Fix jobs workflow by @bertsky in https://github.com/slub/ocrd_manager/pull/36 + +**Full Changelog**: [daed8299411dfb4f3476c5d8ea602ab9ac20c3a4...690f5cf55db139d9e6947dad0903154430782148](https://github.com/slub/ocrd_manager/compare/daed8299411dfb4f3476c5d8ea602ab9ac20c3a4...690f5cf55db139d9e6947dad0903154430782148) + +### OCR-D Monitor + +* Make test by @bertsky in https://github.com/slub/ocrd_monitor/pull/25 +* Dockerfile labels by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/27 +* bug fixes and more by @bertsky in https://github.com/slub/ocrd_monitor/pull/24 +* Mypy checks tests. Run integration tests in CI by @SvenMarcus in https://github.com/slub/ocrd_monitor/pull/23 +* Refactor to BrowserClient. Unify tests with spies and fakes by @SvenMarcus in https://github.com/slub/ocrd_monitor/pull/22 +* Port process spawning to asyncio by @SvenMarcus in https://github.com/slub/ocrd_monitor/pull/21 +* Test CI by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/19 +* Fix reopening browser after closing GTK window by @SvenMarcus in https://github.com/slub/ocrd_monitor/pull/13 +* Merge master changes to ci by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/20 +* Migrate to pyproject.toml by @SvenMarcus in https://github.com/slub/ocrd_monitor/pull/18 +* Use httpx instead of requests by @SvenMarcus in https://github.com/slub/ocrd_monitor/pull/16 +* fix navbar logview URL by @bertsky in https://github.com/slub/ocrd_monitor/pull/12 +* Separate navigation and launching browser into different endpoints by @SvenMarcus in https://github.com/slub/ocrd_monitor/pull/9 +* Improvements env file by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/1 +* Replaces flask with fastapi monitor by @SvenMarcus in https://github.com/slub/ocrd_manager/pull/45 +* Improvements env file by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/1 +* rename dozzle → ocrd-logview by @bertsky in https://github.com/slub/ocrd_manager/pull/44 +* Update-to new repo location by @markusweigelt in https://github.com/slub/ocrd_manager/pull/37 +* Fix jobs workflow by @bertsky in https://github.com/slub/ocrd_manager/pull/36 + +**Full Changelog**: [e9b41de42658f57361a0fe0ff56d673f225e4b4d...b372d2032310a6015a13ebe0ab2ee2edbcb168d1](https://github.com/slub/ocrd_monitor/compare/e9b41de42658f57361a0fe0ff56d673f225e4b4d...b372d2032310a6015a13ebe0ab2ee2edbcb168d1) + +### Kitodo.Production Docker + +* Add APP_CONFIG by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/21 +* Add ngrok by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/20 +* Add expose ngrok by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/19 +* Use Kitodo.Production ActiveMQ docker image of slub organization by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/17 +* Update versions by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/16 +* Add arg for vcs url by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/15 +* Fix some typos (found by codespell) by @stweil in https://github.com/slub/kitodo-production-docker/pull/14 +* Update docker compose call, updates for transfering to slub by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/13 + +**Full Changelog**: [5ad3a5d0b47c558e64fb5523c1a16a30b0028901...9359363e0cc9f54a519b5485eaaf450bd9340b6c](https://github.com/slub/kitodo-production-docker/compare/5ad3a5d0b47c558e64fb5523c1a16a30b0028901...9359363e0cc9f54a519b5485eaaf450bd9340b6c) + + ## [v20230616-stable](https://github.com/slub/ocrd_kitodo/releases/tag/v20230616-stable) ### Integration of OCR-D and Kitodo From 6cfe2e6053283f7b1ad96a5f52d63c577ba72790 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Mon, 19 Jun 2023 13:59:45 +0200 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 93 ---------------------------------------------------- 1 file changed, 93 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4383e4..6859ed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,99 +118,6 @@ **Full Changelog**: [5ad3a5d0b47c558e64fb5523c1a16a30b0028901...9359363e0cc9f54a519b5485eaaf450bd9340b6c](https://github.com/slub/kitodo-production-docker/compare/5ad3a5d0b47c558e64fb5523c1a16a30b0028901...9359363e0cc9f54a519b5485eaaf450bd9340b6c) - -## [v20230616-stable](https://github.com/slub/ocrd_kitodo/releases/tag/v20230616-stable) - -### Integration of OCR-D and Kitodo - -* Add changelog generation by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/72 -* Workflows volume by @bertsky in https://github.com/slub/ocrd_kitodo/pull/74 -* Update submodules by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/71 -* Add before startup script for ssh config for manager by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/69 -* Update makefile-ci.yml by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/66 -* Add make test-kitodo by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/63 -* Add make equivalent for docker compose pull by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/62 -* Update submodule and add monitor by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/61 -* Rename dozzle logview by @bertsky in https://github.com/slub/ocrd_kitodo/pull/59 -* Mkdocs material documentation by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/58 -* update to fixed Controller by @bertsky in https://github.com/slub/ocrd_kitodo/pull/57 -* rules and docs for external Production by @bertsky in https://github.com/slub/ocrd_kitodo/pull/56 -* Fix typo (found by codespell) by @stweil in https://github.com/slub/ocrd_kitodo/pull/55 -* Rename to ocrd_kitodo by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/53 -* Update publish.yml by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/52 -* Update ocrd-manager submodule by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/51 -* Update paths and submodules to transfered repo by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/50 -* Update repository paths and submodules by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/49 -* Add test by @bertsky in https://github.com/slub/ocrd_kitodo/pull/47 -* Extend sample data using seperate script for METS processing, Splits example data and necessary data of setup Makefile process by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/44 - -**Full Changelog**: [79bda3b2f33181d7f4fcd13f02b482f912078eef...f6d037ca0b157c8e7c2bfc8230487162c19a6991](https://github.com/slub/ocrd_kitodo/compare/79bda3b2f33181d7f4fcd13f02b482f912078eef...f6d037ca0b157c8e7c2bfc8230487162c19a6991) - -### OCR-D Controller - -* Provide default value for CONTROLLER_KEYS variable by @SvenMarcus in https://github.com/slub/ocrd_controller/pull/28 -* Defaults for volume source by @markusweigelt in https://github.com/slub/ocrd_controller/pull/27 -* Update publish.yml to build stable version by @markusweigelt in https://github.com/slub/ocrd_controller/pull/25 -* Separation of the host port assignment by @markusweigelt in https://github.com/slub/ocrd_controller/pull/23 -* add another image tag of stable version by @markusweigelt in https://github.com/slub/ocrd_controller/pull/22 -* Add fixed stable version of controller by @markusweigelt in https://github.com/slub/ocrd_controller/pull/21 -* Weekly update of controller image by @markusweigelt in https://github.com/slub/ocrd_controller/pull/20 -* docker-compose.yml: expose port by @bertsky in https://github.com/slub/ocrd_controller/pull/18 -* Fix some typos (found by codespell) by @stweil in https://github.com/slub/ocrd_controller/pull/15 -* Avoid error messages because of hard links by @stweil in https://github.com/slub/ocrd_controller/pull/17 -* Avoid error message because of existing directory by @stweil in https://github.com/slub/ocrd_controller/pull/16 -* remove workflow server branch by @bertsky in https://github.com/slub/ocrd_controller/pull/14 -* Update publish.yml by @markusweigelt in https://github.com/slub/ocrd_controller/pull/13 -* Create publish gh workflow by @markusweigelt in https://github.com/slub/ocrd_controller/pull/12 - -**Full Changelog**: [d3c0192d96bd4e75eadf27d19d9ba9b08297cf41...b2e4a6e668990fe2a455b000c0e5895800be90e1](https://github.com/slub/ocrd_controller/compare/d3c0192d96bd4e75eadf27d19d9ba9b08297cf41...b2e4a6e668990fe2a455b000c0e5895800be90e1) - -### OCR-D Manager - -* Workflow volume by @bertsky in https://github.com/slub/ocrd_manager/pull/57 -* Add opencontainers by @markusweigelt in https://github.com/slub/ocrd_manager/pull/56 -* Test already exist by @markusweigelt in https://github.com/slub/ocrd_manager/pull/55 -* Adjustment of the workflow to publish the stable image version by @markusweigelt in https://github.com/slub/ocrd_manager/pull/54 -* adapt to new core / bash by @bertsky in https://github.com/slub/ocrd_manager/pull/53 -* pre_process_to_workdir: keep subdir by @bertsky in https://github.com/slub/ocrd_manager/pull/52 -* Dockerfile: symlink scripts by @bertsky in https://github.com/slub/ocrd_manager/pull/51 -* Replaces flask with fastapi monitor by @SvenMarcus in https://github.com/slub/ocrd_manager/pull/45 -* Improvements env file by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/1 -* rename dozzle → ocrd-logview by @bertsky in https://github.com/slub/ocrd_manager/pull/44 -* update test-presentation check and docs by @bertsky in https://github.com/slub/ocrd_manager/pull/43 -* CI: determine build args dynamically by @bertsky in https://github.com/slub/ocrd_manager/pull/41 -* expose SSH port by @bertsky in https://github.com/slub/ocrd_manager/pull/42 -* Update publish.yml by @markusweigelt in https://github.com/slub/ocrd_manager/pull/40 -* Change bertsky to slub by @markusweigelt in https://github.com/slub/ocrd_manager/pull/39 -* Update-to new repo location by @markusweigelt in https://github.com/slub/ocrd_manager/pull/37 -* Fix jobs workflow by @bertsky in https://github.com/slub/ocrd_manager/pull/36 - -**Full Changelog**: [daed8299411dfb4f3476c5d8ea602ab9ac20c3a4...57e863fc3b9ca1ff0bff72265bba22317186c551](https://github.com/slub/ocrd_manager/compare/daed8299411dfb4f3476c5d8ea602ab9ac20c3a4...57e863fc3b9ca1ff0bff72265bba22317186c551) - -### OCR-D Monitor - -* fix navbar logview URL by @bertsky in https://github.com/slub/ocrd_monitor/pull/12 -* Separate navigation and launching browser into different endpoints by @SvenMarcus in https://github.com/slub/ocrd_monitor/pull/9 -* Improvements env file by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/1 -* Replaces flask with fastapi monitor by @SvenMarcus in https://github.com/slub/ocrd_manager/pull/45 -* Improvements env file by @markusweigelt in https://github.com/slub/ocrd_monitor/pull/1 -* rename dozzle → ocrd-logview by @bertsky in https://github.com/slub/ocrd_manager/pull/44 -* Update-to new repo location by @markusweigelt in https://github.com/slub/ocrd_manager/pull/37 -* Fix jobs workflow by @bertsky in https://github.com/slub/ocrd_manager/pull/36 - -**Full Changelog**: [e9b41de42658f57361a0fe0ff56d673f225e4b4d...948355be4581066d09f7ecf3d54c4a022ab97350](https://github.com/slub/ocrd_monitor/compare/e9b41de42658f57361a0fe0ff56d673f225e4b4d...948355be4581066d09f7ecf3d54c4a022ab97350) - -### Kitodo.Production Docker - -* Use Kitodo.Production ActiveMQ docker image of slub organization by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/17 -* Update versions by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/16 -* Add arg for vcs url by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/15 -* Fix some typos (found by codespell) by @stweil in https://github.com/slub/kitodo-production-docker/pull/14 -* Update docker compose call, updates for transfering to slub by @markusweigelt in https://github.com/slub/kitodo-production-docker/pull/13 - -**Full Changelog**: [5ad3a5d0b47c558e64fb5523c1a16a30b0028901...97fca72a4a37dfb21eacd331e1febc986113939a](https://github.com/slub/kitodo-production-docker/compare/5ad3a5d0b47c558e64fb5523c1a16a30b0028901...97fca72a4a37dfb21eacd331e1febc986113939a) - - ## [v20220706-stable](https://github.com/slub/ocrd_kitodo/releases/tag/v20220706-stable) * simplify+flexibilize passing uid/gid by @bertsky in https://github.com/slub/ocrd_kitodo/pull/4 From 5f2a35f1cd5e901cc7c2fc245a45a0918e73b0be Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Mon, 19 Jun 2023 14:00:28 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6859ed3..f57129c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ ### Integration of OCR-D and Kitodo -* Release stable version v20230616-stable by @github-actions[bot] in https://github.com/slub/ocrd_kitodo/pull/84 * Update stable release workflow by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/85 * Fix stable release pr by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/83 * Merge main branch into stable branch by @markusweigelt in https://github.com/slub/ocrd_kitodo/pull/82 From 9fa30d59e5ec6e783ecc1b84e7ab31568aec4230 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Mon, 19 Jun 2023 14:01:42 +0200 Subject: [PATCH 4/4] Update .env --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 3a01675..e2ded67 100644 --- a/.env +++ b/.env @@ -19,7 +19,7 @@ MONITOR_PORT_WEB=5000 # host-side port to exposed Web server MONITOR_PORT_LOG=8088 # host-side port to exposed Dozzle (Docker log viewer) # Controller SSH server (with-ocrd-controller) -CONTROLLER_BASE_VERSION=2023-06-14 # tag of ocrd/all from stage version +CONTROLLER_BASE_VERSION=2023-06-18 # tag of ocrd/all from stage version CONTROLLER_IMAGE=ghcr.io/slub/ocrd_controller:stable # name and tag of image CONTROLLER_HOST=ocrd-controller # name/address of server (for Manager/Monitor) CONTROLLER_PORT_SSH=22 # SSH port (for Manager/Monitor)