Use volume from core for ocrd_all docker tests

OCR-D · Feb 15, 2024 · 7885382 · 7885382
1 parent be6b11b
commit 7885382
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 27 deletions.
diff --git a/core b/core
diff --git a/tests/network/docker-compose.yml b/tests/network/docker-compose.yml
@@ -1,21 +1,14 @@
-volumes:
-  ocrd-test-workspace: {}
-
 services:
   ocrd_network_processing_server:
-    image: ocrd/core:v2.62.0
+    image: ocrd/core
     build: !reset null
-    volumes:
-      - "ocrd-test-workspace:/data"
 
   ocrd_network_core_test:
     build:
       context: ../../../core
       args:
         BASE_IMAGE: ubuntu:20.04
         SKIP_ASSETS: 1
-    volumes:
-      - "${PWD}/tests/network/test-workflow-1.txt:/ocrd-data/assets/ocrd_all-test-workflow.txt"
 
   ocrd_dummy_processing_worker:
     build:
@@ -39,7 +32,7 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-olena-binarize worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
 
@@ -58,7 +51,7 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-anybaseocr-crop worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
 
@@ -77,7 +70,7 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-cis-ocropy-denoise worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
 
@@ -96,7 +89,7 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-cis-ocropy-clip worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
 
@@ -115,7 +108,7 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-cis-ocropy-segment worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
 
@@ -134,7 +127,7 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-cis-ocropy-dewarp worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
 
@@ -154,7 +147,7 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-tesserocr-segment-region worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
 
@@ -174,7 +167,7 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-tesserocr-recognize worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
 
@@ -193,6 +186,6 @@ services:
     volumes:
       - ${OCRD_NETWORK_LOGS_ROOT}:/ocrd-data/ocrd_network_logs
       - ${OCRD_NETWORK_SOCKETS_ROOT}:/ocrd-data/ocrd_network_sockets
-      - "ocrd-test-workspace:/data"
+      - ${OCRD_NETWORK_DATA}:/data
     command: ocrd-segment-repair worker --database ${MONGODB_URL} --queue ${RABBITMQ_URL}
 
diff --git a/tests/network/test-workflow-1.txt b/tests/network/test-workflow-1.txt
+1 −0		tests/network/.env
+5 −0		tests/network/docker-compose.yml
+9 −0		tests/network/test-workflow-1.txt
+1 −1		tests/network/test_ocrd_all_workflow.py