Add Manager monitor, simplify and modularise config #21
Conversation
- symlink to Kitodo app compose file - encapsulate selection of compose files in Makefile - move top-level compose file to Manager - create top-level compose file that `extends` Manager/Controller - select between standalone and managed mode by not/including compose file for Controller - delegate all remaining config to variables - place defaults in `.env` - simplify Makefile rules, add `config` and `status` targets - update README
|
For the time being, I have nothing to complain about. Can you still fix the conflicts and rebase to the main? |
|
Oh I think it is still necessary to update the submodules. |
I don't understand. The PR does not show any conflicts. Also, I cannot do anything, because I don't have any permissions.
What do you mean? The PR does update ocrd_manager already. Not to your merge though, only to slub/ocrd_manager#20. So do you want me to update to the current master? |
In my case i selected "Rebase and merge" on the PR so following problem is shown "This branch cannot be rebased due to conflicts". When i change to "Merge pull request" the are no conflicts. Ok so i will select the last to merge and not to rebase.
I meaned the submodule reference to the head of ocrd_manager. sorry i read over the changes in the submodule :/ |
It seems to work (including the Monitor), but I cannot see anything on the Manager logs.