search

slub / ocrd_kitodo

Docker integration of Kitodo.Production and OCR-D
MIT License
9 stars 6 forks source link

Add Manager monitor, simplify and modularise config #21

Closed bertsky closed 2 years ago

bertsky commented 2 years ago

It seems to work (including the Monitor), but I cannot see anything on the Manager logs.

markusweigelt commented 2 years ago

For the time being, I have nothing to complain about. Can you still fix the conflicts and rebase to the main?

markusweigelt commented 2 years ago

Oh I think it is still necessary to update the submodules.

bertsky commented 2 years ago

Can you still fix the conflicts and rebase to the main?

I don't understand. The PR does not show any conflicts. Also, I cannot do anything, because I don't have any permissions.

Oh I think it is still necessary to update the submodules.

What do you mean? The PR does update ocrd_manager already. Not to your merge though, only to https://github.com/markusweigelt/ocrd_manager/pull/20. So do you want me to update to the current master?

markusweigelt commented 2 years ago

Can you still fix the conflicts and rebase to the main?

I don't understand. The PR does not show any conflicts. Also, I cannot do anything, because I don't have any permissions.

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.

Oh I think it is still necessary to update the submodules.

What do you mean? The PR does update ocrd_manager already. Not to your merge though, only to markusweigelt/ocrd_manager#20. So do you want me to update to the current master?

I meaned the submodule reference to the head of ocrd_manager. sorry i read over the changes in the submodule :/