Docker updates for image version refs + consitency env settings.

Author: vladd-bit

docker/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   ocr-service:
     container_name: ocr-service
-    image: ${OCR_SERVICE_DOCKER_IMAGE:-cogstacksystems/cogstack-ocr-service:latest-${CPU_ARCHITECTURE:-amd64}}
+    image: ${OCR_SERVICE_DOCKER_IMAGE:-"cogstacksystems/cogstack-ocr-service:${OCR_SERVICE_IMAGE_RELEASE_VERSION:-latest}-${CPU_ARCHITECTURE:-amd64}"}
     restart: always
     mem_swappiness: 0
     # cpuset: "0-15"
@@ -34,7 +34,7 @@ services:
 
   ocr-service-text-only:
     container_name: ocr-service-text-only
-    image: ${OCR_SERVICE_DOCKER_IMAGE:-cogstacksystems/cogstack-ocr-service:latest-${CPU_ARCHITECTURE:-amd64}}
+    image: ${OCR_SERVICE_DOCKER_IMAGE:-"cogstacksystems/cogstack-ocr-service:${OCR_SERVICE_IMAGE_RELEASE_VERSION:-latest}-${CPU_ARCHITECTURE:-amd64}"}
     restart: always
     mem_swappiness: 0
     # cpuset: "0-15"

env/general.env

@@ -7,3 +7,10 @@
 CPU_ARCHITECTURE=amd64
 DOCKER_DEFAULT_PLATFORM=linux/${CPU_ARCHITECTURE:-amd64}
 COMPOSE_BAKE=True
+
+# This variable is used only in the cogstack-nifi repository since it is
+# the main repository used for deplyments, located here for consistency and reference
+# We need to maintain the prefix for the volumes as if
+# they were deployed from the cogstack-nifi repository /deploy folder
+#
+# VOLUME_PREFIX=deploy_

env/ocr_service.env

@@ -1,6 +1,7 @@
 # The default images for ocr-service:
 #   - cogstacksystems/cogstack-ocr-service:latest
-OCR_SERVICE_DOCKER_IMAGE="cogstacksystems/cogstack-ocr-service:latest-${CPU_ARCHITECTURE:-amd64}"
+OCR_SERVICE_IMAGE_RELEASE_VERSION="latest"
+OCR_SERVICE_DOCKER_IMAGE="cogstacksystems/cogstack-ocr-service:${OCR_SERVICE_IMAGE_RELEASE_VERSION:-latest}-${CPU_ARCHITECTURE:-amd64}"
 
 OCR_SERVICE_CPU_THREADS=1
 OCR_SERVICE_CONVERTER_THREADS=1
@@ -33,7 +34,7 @@ OCR_SERVICE_HOST=0.0.0.0
 
 # READ https://github.com/CogStack/ocr-service/blob/master/README.md on how to handle these settings, 
 # it is important to divide CPU(s) between workers/threads
-OCR_WEB_SERVICE_WORKERS=2
+OCR_WEB_SERVICE_WORKERS=1
 OCR_WEB_SERVICE_THREADS=1
 
 OCR_SERVICE_PORT=8090