From 3ec324c2c41640bc4e044416bb250275f85e4562 Mon Sep 17 00:00:00 2001
From: dev <paul.k.bourelly@leidos.com>
Date: Wed, 17 Apr 2024 11:37:05 -0400
Subject: [PATCH] Updates

---
 carma-messenger-config/chevrolet_tahoe_2018/.env     |  2 ++
 .../chevrolet_tahoe_2018/docker-compose.yml          | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 carma-messenger-config/chevrolet_tahoe_2018/.env

diff --git a/carma-messenger-config/chevrolet_tahoe_2018/.env b/carma-messenger-config/chevrolet_tahoe_2018/.env
new file mode 100644
index 00000000..a2160487
--- /dev/null
+++ b/carma-messenger-config/chevrolet_tahoe_2018/.env
@@ -0,0 +1,2 @@
+DOCKER_ORG=usdotfhwastoldev
+DOCKER_TAG=develop
\ No newline at end of file
diff --git a/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml b/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml
index 73f402f9..3ed05c26 100755
--- a/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml
+++ b/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml
@@ -17,7 +17,7 @@ version: '2'
 
 services:
   roscore:
-    image: usdotfhwastol/carma-base:carma-system-4.5.0
+    image: ${DOCKER_ORG}/carma-base:${DOCKER_TAG}
     network_mode: host
     container_name: roscore
     volumes_from:
@@ -30,7 +30,7 @@ services:
     command: roscore
 
   ros1_bridge:
-    image: usdotfhwastol/carma-msgs:carma-system-4.5.0
+    image: ${DOCKER_ORG}/carma-msgs:${DOCKER_TAG}
     network_mode: host
     container_name: ros1_bridge
     volumes_from:
@@ -45,7 +45,7 @@ services:
     command: bash -c 'wait-for-it.sh localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'
 
   messenger:
-    image: usdotfhwastol/carma-messenger-core:carma-system-4.5.0
+    image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
     network_mode: host
     container_name: carma-messenger-core
     volumes_from:
@@ -58,7 +58,7 @@ services:
     command: wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma-messenger-docker.launch
 
   messenger_ros2:
-    image: usdotfhwastol/carma-messenger-core:carma-system-4.5.0
+    image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
     network_mode: host
     container_name: messenger_ros2
     volumes_from:
@@ -73,7 +73,7 @@ services:
     command: bash -c 'source /opt/carma/install_ros2/setup.bash && ros2 launch /opt/carma/vehicle/config/carma-messenger-docker.launch.py'
 
   cohda_dsrc_driver:
-    image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.5.0
+    image: ${DOCKER_ORG}/carma-cohda-dsrc-driver:${DOCKER_TAG}
     container_name: carma-cohda-dsrc-driver
     network_mode: host
     volumes_from:
@@ -87,7 +87,7 @@ services:
     command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=dsrc_driver'
 
   torc-pinpoint-driver:
-    image: usdotfhwastol/carma-torc-pinpoint-driver:carma-system-4.5.0
+    image: ${DOCKER_ORG}/carma-torc-pinpoint-driver:${DOCKER_TAG}
     container_name: carma-torc-pinpoint-driver
     network_mode: host
     volumes_from: