Conversation
bertsky
left a comment
There was a problem hiding this comment.
I don't see a problem integrating this into core proper.
Even the workflow file should be here (besides dummy-workflow.txt), not in ocrd_all.
And core/tests/network/docker-compose.yml could already bind-mount it to the right location. (This compose file in turn can be included in ocrd_all's compose file.)
Since that workflow test cannot be run without ocrd_all, it should simply be skipped by default.
I see the benefit of DRY and composing the behavior from existing/proven
|
ok, good point!
there's a lot of stuff in there, which will still likely evolve a lot. This would have to be synced with ocrd_all then. If we don't want to inherit/include from core, perhaps we could just have a makefile rule |
| WORKDIR /build-ocrd | ||
| COPY Makefile . | ||
| RUN make assets | ||
| RUN if test -z "$SKIP_ASSETS" || test $SKIP_ASSETS -eq 0 ; then make assets ; fi |
There was a problem hiding this comment.
I would expect SKIP_ASSETS=0 to disable the behavior. Did you mean test $SKIP_ASSETS -eq 1?
There was a problem hiding this comment.
I think SKIP_ASSETS should be renamed to MAKE_ASSETS to reverse the logic.
SKIP_ASSETS itself has a negative meaning. False to False makes True.
SKIP_ASSETS=1 (true) -> do not make assets
SKIP_ASSETS=0 (false) -> make assets
There was a problem hiding this comment.
for me 0 is false so if SKIP_ASSETS is 0 then it is not skipped.
The will be placed in ocrd_all
12df7c8 to
0afb6a1
Compare
# Conflicts: # .scrutinizer.yml
This PR adds a test for ocrd-network. Purpose is that the test is available in the docker-image and can then be used with ocrd_all. It does not run with just core itself ( I am not sure if it is good to do it this way, because it is not supposed to run with "just" plain core).
This PR is required for: OCR-D/ocrd_all#407