Updated docker img ref envs & added extra vol config for deployment consistency.

Author: vladd-bit

docker/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   cogstack-jupyter-hub:
-    image: cogstacksystems/jupyter-hub:2.0.2-${CPU_ARCHITECTURE:-amd64}
+    image: cogstacksystems/jupyter-hub:${JUPYTER_HUB_IMAGE_RELEASE_VERSION:-latest}-${CPU_ARCHITECTURE:-amd64}
     container_name: cogstack-jupyter-hub
     restart: always
     environment:
@@ -46,8 +46,10 @@ services:
 
 volumes:
   jupyter-hub-vol:
+    name: "${VOLUME_PREFIX:-deploy_}jupyter-hub-vol"
     driver: local
   jupyter-hub-shared-scratch:
+    name: "${VOLUME_PREFIX:-deploy_}jupyter-hub-shared-scratch"
     driver: local
 
 #---------------------------------------------------------------------------#

env/general.env

@@ -5,4 +5,12 @@
 # remove if this causes issues on any other platform
 # possible values: amd64, arm64
 CPU_ARCHITECTURE=amd64
-DOCKER_DEFAULT_PLATFORM=linux/${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/jupyter.env

@@ -9,7 +9,8 @@
 #   jupyter-singleuser-gpu AMD64: ogstacksystems/jupyter-singleuser-gput:latest-amd64
 #   last stable release build (AMD64 only): "cogstacksystems/jupyter-singleuser:1.2.7"
 # The CogStack images are huge and will take a bit to download
-DOCKER_NOTEBOOK_IMAGE="cogstacksystems/jupyter-singleuser:2.0.2-${CPU_ARCHITECTURE:-amd64}"
+JUPYTER_HUB_IMAGE_RELEASE_VERSION=2.0.2
+DOCKER_NOTEBOOK_IMAGE="cogstacksystems/jupyter-singleuser:${JUPYTER_HUB_IMAGE_RELEASE_VERSION:-latest}-${CPU_ARCHITECTURE:-amd64}"
 
 # This needs to be set to true if you intend to use the GPU image
 # possible values: "true", "false"