From e0ea409acc391e59fcae9b342a7b89ef5525e172 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Thu, 6 Jul 2023 14:32:05 +0200 Subject: [PATCH 1/8] update modules to MongoDB based PRs --- _modules/ocrd_manager | 2 +- _modules/ocrd_monitor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_modules/ocrd_manager b/_modules/ocrd_manager index 690f5cf..3dd95db 160000 --- a/_modules/ocrd_manager +++ b/_modules/ocrd_manager @@ -1 +1 @@ -Subproject commit 690f5cf55db139d9e6947dad0903154430782148 +Subproject commit 3dd95db47a0a0c5564a49f5e98505b14769b606f diff --git a/_modules/ocrd_monitor b/_modules/ocrd_monitor index b372d20..a01047a 160000 --- a/_modules/ocrd_monitor +++ b/_modules/ocrd_monitor @@ -1 +1 @@ -Subproject commit b372d2032310a6015a13ebe0ab2ee2edbcb168d1 +Subproject commit a01047a7888c9293f128fe66e92fd5391e8cbf77 From 6404f3cf1a9c6708c87cb71f6aa526b3253ecf0a Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Thu, 6 Jul 2023 14:33:02 +0200 Subject: [PATCH 2/8] docker-compose: add ocrd-database (and mongo-express) with dependencies --- docker-compose.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 9f76baa..301c915 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: service: ocrd-manager depends_on: - ocrd-controller + - ocrd-database ocrd-monitor: extends: @@ -15,12 +16,26 @@ services: service: ocrd-monitor depends_on: - ocrd-controller + - ocrd-database ocrd-logview: extends: file: _modules/ocrd_monitor/docker-compose.yml service: ocrd-logview + ocrd-database: + extends: + file: _modules/ocrd_monitor/docker-compose.yml + service: ocrd-database + + mongo-express: + extends: + file: _modules/ocrd_monitor/docker-compose.yml + service: mongo-express + depends_on: + ocrd-database: + condition: service_started + # OCR-D Controller ocrd-controller: @@ -96,4 +111,5 @@ services: - with-kitodo-production volumes: + db-volume: shared: From c03207af0986d51bcea2c315b05cfe2e44eea6e5 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Thu, 6 Jul 2023 14:33:44 +0200 Subject: [PATCH 3/8] .env: add port variable for mongo-express --- .env | 1 + 1 file changed, 1 insertion(+) diff --git a/.env b/.env index c52b7c9..4ee4ed0 100644 --- a/.env +++ b/.env @@ -17,6 +17,7 @@ MONITOR_IMAGE=ghcr.io/slub/ocrd_monitor:latest # name and tag of image MONITOR_HOST=ocrd-monitor # name/address of server MONITOR_PORT_WEB=5000 # host-side port to exposed Web server MONITOR_PORT_LOG=8088 # host-side port to exposed Dozzle (Docker log viewer) +MONITOR_PORT_DBE=8082 # host-side port to exposed MongoDB Express (DB browser) # Controller SSH server (with-ocrd-controller) CONTROLLER_BASE_VERSION=maximum-cuda # tag of ocrd/all from stage version From 745f5d7b686eaf067e85a4d7c55a57e515f30e6d Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Thu, 6 Jul 2023 14:34:41 +0200 Subject: [PATCH 4/8] .env: add ocrd-database root user (no distinction to kitodo-db credentials yet) --- .env | 1 + 1 file changed, 1 insertion(+) diff --git a/.env b/.env index 4ee4ed0..febfcd7 100644 --- a/.env +++ b/.env @@ -46,6 +46,7 @@ APP_PORT=8080 # host-side port of Kitodo.Production DB_IMAGE=mysql:8.0.32 # name and tag of image DB_HOST=kitodo-db # name/address of database (for Kitodo) DB_PORT=3306 # host-side port to exposed database +DB_ROOT_USER=root DB_ROOT_PASSWORD=1234 # root user password DB_NAME=kitodo # name of database used by Kitodo.Production DB_USER=kitodo # username to access database From bba4b15597f51913708a1a630aebf69e18eb8d14 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Tue, 8 Aug 2023 12:57:08 +0200 Subject: [PATCH 5/8] Update submodules and variables --- .env | 3 ++- _modules/kitodo-production-docker | 2 +- _modules/ocrd_manager | 2 +- docker-compose.yml | 13 ++++++++----- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.env b/.env index febfcd7..02e8a9d 100644 --- a/.env +++ b/.env @@ -4,6 +4,7 @@ COMPOSE_PROJECT_NAME=ocrd_kitodo MANAGER_IMAGE=ghcr.io/slub/ocrd_manager:latest # name and tag of image MANAGER_HOST=ocrd-manager # name/address of server (for Kitodo) MANAGER_PORT_SSH=9022 # host-side port to exposed SSH server (for external Kitodo) +MANAGER_PORT_WEB=4004 # port of web endpoint MANAGER_ENV_UID=1001 # user id of SSH user (`id -u` when using `make`) MANAGER_ENV_GID=1001 # group id of SSH user (`id -g` when using `make`) MANAGER_ENV_UMASK=0002 # ssh user specific permission mask @@ -17,7 +18,7 @@ MONITOR_IMAGE=ghcr.io/slub/ocrd_monitor:latest # name and tag of image MONITOR_HOST=ocrd-monitor # name/address of server MONITOR_PORT_WEB=5000 # host-side port to exposed Web server MONITOR_PORT_LOG=8088 # host-side port to exposed Dozzle (Docker log viewer) -MONITOR_PORT_DBE=8082 # host-side port to exposed MongoDB Express (DB browser) +MONITOR_PORT_DBM=8082 # host-side port to exposed OCR-D Database Management (Mongo Express) # Controller SSH server (with-ocrd-controller) CONTROLLER_BASE_VERSION=maximum-cuda # tag of ocrd/all from stage version diff --git a/_modules/kitodo-production-docker b/_modules/kitodo-production-docker index 9359363..46c6fde 160000 --- a/_modules/kitodo-production-docker +++ b/_modules/kitodo-production-docker @@ -1 +1 @@ -Subproject commit 9359363e0cc9f54a519b5485eaaf450bd9340b6c +Subproject commit 46c6fdeb08392bbcde61155bb9fbe5f98ac9c483 diff --git a/_modules/ocrd_manager b/_modules/ocrd_manager index 3dd95db..653ad46 160000 --- a/_modules/ocrd_manager +++ b/_modules/ocrd_manager @@ -1 +1 @@ -Subproject commit 3dd95db47a0a0c5564a49f5e98505b14769b606f +Subproject commit 653ad46eecd15386855c02e97ab0c1679123b060 diff --git a/docker-compose.yml b/docker-compose.yml index 301c915..67e30eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,10 +28,10 @@ services: file: _modules/ocrd_monitor/docker-compose.yml service: ocrd-database - mongo-express: + ocrd-database-management: extends: file: _modules/ocrd_monitor/docker-compose.yml - service: mongo-express + service: ocrd-database-management depends_on: ocrd-database: condition: service_started @@ -61,11 +61,14 @@ services: build: args: BUILDER_TYPE: git - BUILDER_GIT_COMMIT: ${APP_BUILDER_GIT_COMMIT} - BUILDER_GIT_SOURCE_URL: ${APP_BUILDER_GIT_SOURCE_URL} + BUILDER_GIT_REF: ${APP_BUILDER_GIT_REF} + BUILDER_GIT_REPOSITORY: ${APP_BUILDER_GIT_REPOSITORY} environment: - - "OCRD_MANAGER=${MANAGER_HOST}:22" + APP_FOOTER_INFO: "Repository: ${APP_BUILDER_GIT_REPOSITORY}, Ref: ${APP_BUILDER_GIT_REF}" + GIT_REF: ${APP_BUILDER_GIT_REF} + GIT_REPOSITORY: ${APP_BUILDER_GIT_REPOSITORY} + OCRD_MANAGER: "${MANAGER_HOST}:22" depends_on: - kitodo-db From 059187923197dc71fcea6f9c8a697dd6337052d9 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Tue, 8 Aug 2023 18:24:29 +0200 Subject: [PATCH 6/8] Change app builder variables --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 02e8a9d..80300fc 100644 --- a/.env +++ b/.env @@ -37,8 +37,8 @@ CONTROLLER_WORKERS=1 # number of workers for processing # Application Kitodo.Production (with-kitodo-production) APP_IMAGE=ghcr.io/slub/ocrd_kitodo/kitodo_production_ocrd:latest # name and tag of image APP_BUILD_CONTEXT=${PWD}/_modules/kitodo-production-docker/ # directory of Dockerfile -APP_BUILDER_GIT_COMMIT=ocrd-main # branch "ocrd-main" of git repository (cause using `git` as `BUILDER_TYPE`) -APP_BUILDER_GIT_SOURCE_URL=https://github.com/markusweigelt/kitodo-production/ # repository of `BUILDER_GIT_COMMIT` (cause using `git` as `BUILDER_TYPE`) +APP_BUILDER_GIT_REF=ocrd-main # branch "ocrd-main" of git repository (cause using `git` as `BUILDER_TYPE`) +APP_BUILDER_GIT_REPOSITORY=markusweigelt/kitodo-production # repository of `BUILDER_GIT_COMMIT` (cause using `git` as `BUILDER_TYPE`) APP_DATA=${PWD}/kitodo/data # persistent volume of application data to mount, e.g. config and modules APP_KEY=${PWD}/kitodo/.ssh/id_rsa # file path with private SSH key of `ocrd` user (should match one of `MANAGER_KEYS`) APP_PORT=8080 # host-side port of Kitodo.Production From 818ace21abce2539a262fc6ac294fdaada198ed6 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Thu, 10 Aug 2023 11:29:23 +0200 Subject: [PATCH 7/8] Update submodules --- _modules/ocrd_manager | 2 +- _modules/ocrd_monitor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_modules/ocrd_manager b/_modules/ocrd_manager index 653ad46..c5d4f77 160000 --- a/_modules/ocrd_manager +++ b/_modules/ocrd_manager @@ -1 +1 @@ -Subproject commit 653ad46eecd15386855c02e97ab0c1679123b060 +Subproject commit c5d4f77a617b1c02840481169ac868d08d84325c diff --git a/_modules/ocrd_monitor b/_modules/ocrd_monitor index a01047a..da26477 160000 --- a/_modules/ocrd_monitor +++ b/_modules/ocrd_monitor @@ -1 +1 @@ -Subproject commit a01047a7888c9293f128fe66e92fd5391e8cbf77 +Subproject commit da264774ef13e1dc367e0246464abd2190227d7a From 18fe4dbc01df923df419173aa768e698481ff553 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Thu, 10 Aug 2023 12:39:40 +0200 Subject: [PATCH 8/8] Update submodule --- _modules/ocrd_manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_modules/ocrd_manager b/_modules/ocrd_manager index c5d4f77..52587e9 160000 --- a/_modules/ocrd_manager +++ b/_modules/ocrd_manager @@ -1 +1 @@ -Subproject commit c5d4f77a617b1c02840481169ac868d08d84325c +Subproject commit 52587e9e2c3e669bf832da3d4839a7254d1327fe