Docker: Set ACH_TUTORIAL in the Docker Compose files, fixing broken Brev startup.

Author: brycelelbach

brev/dev-start.bash

@@ -55,7 +55,6 @@ docker volume create --driver local \
   "${ACH_TUTORIAL}_accelerated-computing-hub"
 
 echo "Starting tutorial: ${ACH_TUTORIAL}"
-export ACH_TUTORIAL
 cd ${MOUNT}
 docker compose -f ${DOCKER_COMPOSE} up -d
 

brev/test-docker-compose.bash

@@ -101,8 +101,6 @@ if docker volume inspect "${VOLUME_NAME}" &>/dev/null; then
     echo ""
 fi
 
-# Export environment variables for the container
-export ACH_TUTORIAL
 export ACH_RUN_TESTS=1
 
 # Start containers

tutorials/accelerated-python/brev/docker-compose.yml

@@ -1,4 +1,4 @@
-name: accelerated-python
+name: &tutorial-name accelerated-python
 
 x-config:
   dockerfile: &dockerfile tutorials/accelerated-python/brev/dockerfile
@@ -24,8 +24,8 @@ x-config:
       - accelerated-computing-hub:/accelerated-computing-hub
     environment:
       - BREV_ENV_ID
-      - ACH_TUTORIAL
       - ACH_RUN_TESTS
+      ACH_TUTORIAL: *tutorial-name
     user: root
     working_dir: *working-dir
   persistent-service: &persistent-service

tutorials/cuda-cpp/brev/docker-compose.yml

@@ -1,4 +1,4 @@
-name: cuda-cpp
+name: &tutorial-name cuda-cpp
 
 x-config:
   dockerfile: &dockerfile tutorials/cuda-cpp/brev/dockerfile
@@ -23,8 +23,8 @@ x-config:
       - accelerated-computing-hub:/accelerated-computing-hub
     environment:
       - BREV_ENV_ID
-      - ACH_TUTORIAL
       - ACH_RUN_TESTS
+      ACH_TUTORIAL: *tutorial-name
     user: root
     working_dir: *working-dir
   persistent-service: &persistent-service

tutorials/nvmath-python/brev/docker-compose.yml

@@ -1,4 +1,4 @@
-name: nvmath-python
+name: &tutorial-name nvmath-python
 
 x-config:
   dockerfile: &dockerfile tutorials/nvmath-python/brev/dockerfile
@@ -24,8 +24,8 @@ x-config:
       - accelerated-computing-hub:/accelerated-computing-hub
     environment:
       - BREV_ENV_ID
-      - ACH_TUTORIAL
       - ACH_RUN_TESTS
+      ACH_TUTORIAL: *tutorial-name
     user: root
     working_dir: *working-dir
   persistent-service: &persistent-service

tutorials/stdpar/brev/docker-compose.yml

@@ -1,4 +1,4 @@
-name: stdpar
+name: &tutorial-name stdpar
 
 x-config:
   dockerfile: &dockerfile tutorials/stdpar/brev/dockerfile
@@ -23,8 +23,8 @@ x-config:
       - accelerated-computing-hub:/accelerated-computing-hub
     environment:
       - BREV_ENV_ID
-      - ACH_TUTORIAL
       - ACH_RUN_TESTS
+      ACH_TUTORIAL: *tutorial-name
     user: root
     working_dir: *working-dir
   persistent-service: &persistent-service