diff --git a/Dockerfile b/Dockerfile index fe9401159e3e21b373e4767721acaab27b3f82ca..ebf5b16dbf7c9787a6cd597adf0098f056fdb67c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ocrd/all:2023-02-07 +FROM ocrd/all:2023-03-26 WORKDIR /app @@ -20,8 +20,6 @@ RUN git submodule add https://github.com/MehmedGIT/OtoN_Converter submodules/oto RUN git submodule update --init RUN cd submodules/oton && \ - sed -i 's \\\\$HOME/venv37-ocrd/bin/activate g' oton/config.toml && \ - sed -i "s \$projectDir/ocrd-workspace/ $WORKSPACE_DIR/CURRENT/ g" oton/config.toml && \ pip install . RUN pip3 install -r requirements.txt diff --git a/workflows/execute_workflows.sh b/workflows/execute_workflows.sh index efe1a6f9eefa3bc7e1aeeab446db80a175db5eb1..cb52f1b0db5c480b43150f1c0bb33914ee011845 100755 --- a/workflows/execute_workflows.sh +++ b/workflows/execute_workflows.sh @@ -147,7 +147,7 @@ run() { # $2: $DIR_NAME # $3: $WS_DIR adjust_workflow_settings "$1" "$2" - nextflow run "$1" -with-weblog http://127.0.0.1:8000/nextflow/ + nextflow run "$1" -with-weblog http://127.0.0.1:8000/nextflow/ --mets_path "/app/workflows/workspaces/$2/data/*/mets.xml" rename_and_move_nextflow_result "$1" "$2" save_workspaces "$3"/data "$2" "$1" }