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

Mkdocs material documentation #58

Merged
merged 107 commits into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
526da8b
add mkdocs-material
markusweigelt Jul 7, 2022
201117b
add material theme
markusweigelt Jul 7, 2022
f8427dc
change theme palette
markusweigelt Jul 7, 2022
80549da
add some features
markusweigelt Jul 7, 2022
4c064b0
add mkdocs of subrepo
markusweigelt Jul 12, 2022
416b347
change module path
markusweigelt Jul 12, 2022
293b87e
improve workflow
markusweigelt Jul 12, 2022
0e5191c
adjust workflows
markusweigelt Jul 12, 2022
05b770c
second theme build
markusweigelt Jul 12, 2022
6308166
checkout repository and submodules
markusweigelt Jul 12, 2022
83ece49
change checkout branch of kitodo production docker module
markusweigelt Jul 12, 2022
6da6a9c
remove unnecessary mkdocs build
markusweigelt Jul 12, 2022
9d417e3
update submodule
markusweigelt Jul 12, 2022
621c180
update submodule
markusweigelt Jul 12, 2022
fa9024d
update submodules and add mkdocs branches
markusweigelt Jul 12, 2022
8b4abe9
update submodules
markusweigelt Jul 12, 2022
7a10b59
add documentation files
markusweigelt Jul 12, 2022
5d7e86c
improve documentation files
markusweigelt Jul 12, 2022
322cdb3
add existing documention and restructure initial
markusweigelt Jul 13, 2022
42441ef
add single quotes
markusweigelt Jul 13, 2022
e2d9d30
improve documentation
markusweigelt Jul 13, 2022
1bd722e
add generation of markdown tables
markusweigelt Jul 13, 2022
38bc586
add execute rights
markusweigelt Jul 13, 2022
4fbf486
create generate directory if not exists
markusweigelt Jul 13, 2022
c18e778
add mkdocs-monorepo-plugin again
markusweigelt Jul 13, 2022
0edda04
add include markdown plugin, improve documentation
markusweigelt Jul 13, 2022
5261f42
remove include-markdown
markusweigelt Jul 13, 2022
8ba80c6
add mkdocs-macros-plugin
markusweigelt Jul 13, 2022
4ca038b
add comments to controller envs
markusweigelt Jul 13, 2022
e9733d2
improve env documentation
markusweigelt Jul 13, 2022
bade2bf
change path
markusweigelt Jul 13, 2022
ea328aa
exclude search
markusweigelt Jul 13, 2022
22e56d9
Update documentation
markusweigelt Nov 8, 2022
dee52f8
remove resource builder from documentation
markusweigelt Nov 8, 2022
91fb91a
Update documentation
markusweigelt Nov 9, 2022
cda9aa4
remove 'None' plugin
markusweigelt Nov 9, 2022
f24ad76
Update documentation
markusweigelt Nov 9, 2022
eed0d6a
Update documentation
markusweigelt Nov 9, 2022
d8427a0
Update documentation
markusweigelt Nov 9, 2022
a3642bc
update documentation
markusweigelt Nov 9, 2022
3595fe1
update documentation
markusweigelt Nov 9, 2022
54e065f
improve documentation home
markusweigelt Nov 9, 2022
c7ea882
update documentation
markusweigelt Nov 9, 2022
7a367e8
improve configuration documentation
markusweigelt Nov 9, 2022
ed16371
improve links to module config
markusweigelt Nov 9, 2022
a2d6078
improve documentation
markusweigelt Nov 9, 2022
9046bba
update documentation
markusweigelt Nov 9, 2022
b72ed46
Update documentation after review
markusweigelt Nov 9, 2022
8c18ef8
change include path
markusweigelt Nov 9, 2022
24132ae
change includes path again
markusweigelt Nov 9, 2022
b11c21c
update module service text
markusweigelt Nov 9, 2022
7025078
Improve documentation
markusweigelt Nov 10, 2022
c862c53
uodate documentation
markusweigelt Nov 10, 2022
8843675
Improve documentation
markusweigelt Nov 10, 2022
0019dc5
update documentation
markusweigelt Nov 10, 2022
1de2114
update mkdocs to active meramid
markusweigelt Nov 10, 2022
f8e4073
update doc
markusweigelt Nov 11, 2022
b13b77e
improve ocr-d controller link
markusweigelt Nov 11, 2022
385624a
remove unused modules
markusweigelt Nov 11, 2022
dcecc05
update config modules considering externals
markusweigelt Nov 11, 2022
a5e8557
improve wording and linking
markusweigelt Nov 11, 2022
704f0a5
Improve linking and texts
markusweigelt Nov 11, 2022
1ec3a1e
Improvements documentation
markusweigelt Nov 11, 2022
f400ee9
add env comment to env variable
markusweigelt Nov 11, 2022
5bf007a
comment for env to generate description
markusweigelt Nov 11, 2022
a8f8b96
Update getting-started.md
markusweigelt Nov 11, 2022
a16aba3
Update documentation
markusweigelt Nov 21, 2022
76cd0d1
Update documentation
markusweigelt Nov 21, 2022
7ca4e80
Update documentation
markusweigelt Nov 21, 2022
08738d9
Update documentation
markusweigelt Nov 21, 2022
336f3a4
Update documentation
markusweigelt Nov 21, 2022
50d173e
Update documentation
markusweigelt Nov 21, 2022
0995aaf
Update documentation
markusweigelt Nov 22, 2022
23e14e3
Update documentation
markusweigelt Nov 22, 2022
e17c9c2
Update documentation
markusweigelt Nov 22, 2022
f0cb2c7
Update documentation
markusweigelt Nov 22, 2022
102a48d
Update documentation
markusweigelt Nov 22, 2022
810a780
Update docs/usage/ocrd-controller.md
markusweigelt Nov 24, 2022
c80d895
Apply suggestions from code review
markusweigelt Nov 24, 2022
dcea67f
Update env file and getting started
markusweigelt Nov 24, 2022
707e199
Apply suggestions from code review
markusweigelt Nov 25, 2022
a6199c4
update architecture figure
bertsky Nov 30, 2022
161cf61
remove profile subsections, keep summaries for external short
bertsky Nov 30, 2022
6e0af31
improve markup
bertsky Nov 30, 2022
3eac10e
Update preparation.md
bertsky Nov 30, 2022
4a989c3
mkdocs: add usage/overview
bertsky Nov 30, 2022
a9312b3
Create overview.md
bertsky Nov 30, 2022
106e41b
Update overview.md
bertsky Nov 30, 2022
060d736
try to get subitemize working
bertsky Nov 30, 2022
6126c37
more markdown dialect noise
bertsky Nov 30, 2022
8828322
try item indentation depth
bertsky Nov 30, 2022
3b8e1c6
fix rellinks
bertsky Nov 30, 2022
1c393c2
Update ocrd-manager.md
bertsky Nov 30, 2022
17d17cc
fix rellinks
bertsky Nov 30, 2022
40036dc
subsections as service names
bertsky Nov 30, 2022
20fb8ef
Update overview.md
markusweigelt Nov 30, 2022
61864ea
Update overview.md
markusweigelt Nov 30, 2022
36321e6
data: add controller models and config
bertsky Nov 30, 2022
91ce5e7
Create overview.md
markusweigelt Nov 30, 2022
f2c83bd
data: add controller models and config
bertsky Nov 30, 2022
29b09ef
Update preparation.md
bertsky Nov 30, 2022
92ef851
Update index.md
bertsky Nov 30, 2022
c34b7bb
Update overview.md
bertsky Nov 30, 2022
2dd1e0b
strip now redundant content of Readme
bertsky Nov 30, 2022
39f75b9
update figures
bertsky Nov 30, 2022
289ae61
rename title consistently
bertsky Nov 30, 2022
69829bf
Merge branch 'main' into mkdocs-material
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
94 changes: 47 additions & 47 deletions .env
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
COMPOSE_PROJECT_NAME=ocrd_kitodo

# Manager SSH server
MANAGER_IMAGE=ghcr.io/slub/ocrd_manager:latest
MANAGER_HOST=ocrd-manager
MANAGER_PORT_SSH=9022
MANAGER_ENV_UID=1001
MANAGER_ENV_GID=1001
MANAGER_ENV_UMASK=0002
MANAGER_KEYS=${PWD}/ocrd/manager/.ssh/authorized_keys
MANAGER_KEY=${PWD}/ocrd/manager/.ssh/id_rsa
MANAGER_DATA=${PWD}/kitodo/data/metadata
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_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
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

# Monitor Web server
MONITOR_IMAGE=ghcr.io/slub/ocrd_monitor:latest
MONITOR_HOST=ocrd-monitor
MONITOR_PORT_WEB=5000
MONITOR_PORT_GTK=8500
MONITOR_PORT_LOG=8088
MONITOR_DATA=${PWD}/kitodo/data/metadata
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_GTK=8500 # host-side port to exposed Broadwayd (Gtk Web server)
MONITOR_PORT_LOG=8088 # host-side port to exposed Dozzle (Docker log viewer)
MONITOR_DATA=${PWD}/kitodo/data/metadata # persistent data volume to mount

# Controller SSH server (with-ocrd-controller)
CONTROLLER_IMAGE=ghcr.io/slub/ocrd_controller:latest
CONTROLLER_HOST=ocrd-controller
CONTROLLER_PORT_SSH=22
CONTROLLER_ENV_UID=1001
CONTROLLER_ENV_GID=1001
CONTROLLER_ENV_UMASK=0002
CONTROLLER_KEYS=${PWD}/ocrd/controller/.ssh/authorized_keys
CONTROLLER_DATA=${PWD}/kitodo/data/metadata
CONTROLLER_MODELS=${PWD}/ocrd/controller/models
CONTROLLER_CONFIG=${PWD}/ocrd/controller/config
CONTROLLER_WORKERS=1
CONTROLLER_IMAGE=ghcr.io/slub/ocrd_controller:latest # 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)
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_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

# Application Kitodo.Production (with-kitodo-production)
APP_IMAGE=ghcr.io/slub/ocrd_kitodo/kitodo_production_ocrd:latest
APP_BUILD_CONTEXT=${PWD}/_modules/kitodo-production-docker/
APP_BUILDER_GIT_COMMIT=ocrd-main
APP_BUILDER_GIT_SOURCE_URL=https://github.com/markusweigelt/kitodo-production/
APP_DATA=${PWD}/kitodo/data
APP_KEY=${PWD}/kitodo/.ssh/id_rsa
APP_PORT=8080
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_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

# Database (with-kitodo-production)
DB_IMAGE=mysql:8.0.31
DB_HOST=kitodo-db
DB_PORT=3306
DB_ROOT_PASSWORD=1234
DB_NAME=kitodo
DB_USER=kitodo
DB_USER_PASSWORD=kitodo
DB_IMAGE=mysql:8.0.31 # 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_PASSWORD=1234 # root user password
DB_NAME=kitodo # name of database used by Kitodo.Production
DB_USER=kitodo # username to access database
DB_USER_PASSWORD=kitodo # password used by username to access database

# Elastic Search (with-kitodo-production)
ES_IMAGE=elasticsearch:7.17.7
ES_HOST=kitodo-es
ES_REST_PORT=9200
ES_NODE_PORT=9300
ES_IMAGE=elasticsearch:7.17.7 # name and tag of image
ES_HOST=kitodo-es # name/address of server (for Kitodo)
ES_REST_PORT=9200 # host-side port to REST API
ES_NODE_PORT=9300 # host-side port to inter-node protocol

# Active MQ (with-kitodo-production)
MQ_IMAGE=markusweigelt/activemq:latest
MQ_HOST=kitodo-mq
MQ_PORT=61616
MQ_IMAGE=markusweigelt/activemq:latest # name and tag of image
MQ_HOST=kitodo-mq # name/address of server (for Kitodo/Manager)
MQ_PORT=61616 # host-side port to exposed TCP Transport
17 changes: 17 additions & 0 deletions .github/scripts/build-env-mds.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
LASTPREFIX=""
TARGETDIR="./docs/_generated/"
mkdir -p $TARGETDIR
grep -v '^\s*$\|^\s*\#' .env | while read -r line; do
PREFIX=${line%%_*}
if [ "$PREFIX" == "COMPOSE" ]; then
continue
fi
FILENAME=${TARGETDIR}env-${PREFIX,,}-table.md
if [ "$PREFIX" != "$LASTPREFIX" ]; then
echo '| Name | Default | Description' >> $FILENAME
echo '| --- | --- | ---' >> $FILENAME
fi
echo $line | sed 's/ / | /; s/=/ | /; s/| #/| /; s/^/| /; s/${PWD}/./' | sed -r -e 's/\.\/([^ ]*)/`\.\/\1`/;' >> $FILENAME
LASTPREFIX=$PREFIX
done
26 changes: 26 additions & 0 deletions .github/workflows/publish-documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Publish the documentation of integration of OCR-D and Kitodo
on:
push:
branches:
- main
- mkdocs-material
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Build environment variable markdown files
run: ./.github/scripts/build-env-mds.sh
shell: bash
- run: pip install mkdocs-material
- run: pip install mkdocs-monorepo-plugin
- run: pip install mkdocs-macros-plugin
- run: pip install mkdocs-exclude-search
- run: mkdocs build --theme material
- run: mkdocs gh-deploy --force
File renamed without changes.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
*.iml
/docker-compose.kitodo-app.dev.yml
/.idea/*
_generated
site
Loading