Add database

.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,6 +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_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
@@ -35,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
@@ -45,6 +47,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

docker-compose.yml

@@ -8,19 +8,34 @@ services:
       service: ocrd-manager
     depends_on:
       - ocrd-controller
+      - ocrd-database
 
   ocrd-monitor:
     extends:
       file: _modules/ocrd_monitor/docker-compose.yml
       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
+
+  ocrd-database-management:
+    extends:
+      file: _modules/ocrd_monitor/docker-compose.yml
+      service: ocrd-database-management
+    depends_on:
+      ocrd-database:
+        condition: service_started
+
   # OCR-D Controller
 
   ocrd-controller:
@@ -46,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: <a href=\"https://github.com/${APP_BUILDER_GIT_REPOSITORY}/\">${APP_BUILDER_GIT_REPOSITORY}</a>, Ref: <a href=\"https://github.com/${APP_BUILDER_GIT_REPOSITORY}/tree/${APP_BUILDER_GIT_REF}\">${APP_BUILDER_GIT_REF}</a>"
+      GIT_REF: ${APP_BUILDER_GIT_REF}
+      GIT_REPOSITORY: ${APP_BUILDER_GIT_REPOSITORY}
+      OCRD_MANAGER: "${MANAGER_HOST}:22"
 
     depends_on:
       - kitodo-db
@@ -96,4 +114,5 @@ services:
       - with-kitodo-production
 
 volumes:
+  db-volume:
   shared: