rename

usdot-fhwa-stol · Mar 25, 2024 · 7408c0d · 7408c0d
1 parent 43f7bdd
commit 7408c0d
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 25 deletions.
diff --git a/telematic_system/docker-compose.cloud.servers.yml b/telematic_system/docker-compose.cloud.servers.yml
@@ -2,16 +2,18 @@ version: "3"
 services:
   nats:
     image: 'nats:2.7.3-alpine3.15'
+    container_name: nats
     restart: always
     logging:
       options:
         max-size: "2g"
         max-file: "1"
     network_mode: host
 
-  telematic_messaging_server:
+  messaging_server:
     build:
       context: "./telematic_cloud_messaging"
+    container_name: messaging_server
     depends_on:
       - nats
     restart: always

diff --git a/telematic_system/docker-compose.dbs.yml b/telematic_system/docker-compose.dbs.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   influxdb:
     image:  influxdb:${INFLUXDB_DEV_TAG} 
-    container_name: influxdb-dev
+    container_name: influxdb
     ports:
       - '8086:8086'
     restart: always

diff --git a/telematic_system/docker-compose.historical.yml b/telematic_system/docker-compose.historical.yml
@@ -1,11 +1,10 @@
 version: "3.4"
 services:
-  rosbag2-processing-service:
+  rosbag2_processing_service:
     build:
           context: ./telematic_historical_data_processing
           dockerfile: Dockerfile
           network: host
-    image: usdotfhwastoldev/rosbag2_processing_service:develop
     logging:
       options:
         max-size: "2g"

diff --git a/telematic_system/docker-compose.local.yml b/telematic_system/docker-compose.local.yml
@@ -3,7 +3,7 @@ services:
 
   influxdb:
     image:  influxdb:${INFLUXDB_DEV_TAG}
-    container_name: influxdb-dev
+    container_name: influxdb
     ports:
       - '8086:8086'
     restart: always
@@ -27,6 +27,7 @@ services:
   mysqldb:
     image: mysql:5.7
     restart: always
+    container_name: mysqldb
     environment:
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
@@ -43,6 +44,7 @@ services:
   nats:
     image: 'nats:2.7.3-alpine3.15'
     restart: always
+    container_name: nats
     logging:
       options:
         max-size: "2g"
@@ -53,6 +55,7 @@ services:
       build:
         context: "./telematic_apps/grafana"
       restart: always
+      container_name: grafana
       logging:
         options:
           max-size: "10m"
@@ -69,11 +72,12 @@ services:
         - /home/ubuntu/.aws/credentials:/usr/share/grafana/.aws/credentials
       user: "472" #grafana user id
 
-  telematic_web_server:
+  web_server:
       build:
         context: "./telematic_apps/web_app/server"
         dockerfile: "local.Dockerfile"
       restart: always
+      container_name: web_server
       logging:
         options:
           max-size: "10m"
@@ -119,23 +123,25 @@ services:
         - /opt/apache2/grafana_htpasswd:/opt/apache2/grafana_htpasswd
         - /opt/telematics/upload:/opt/telematics/upload
 
-  telematic_web_client:
+  web_client:
     build:
       context: "./telematic_apps/web_app/client"
     restart: always
+    container_name: web_client
     logging:
       options:
         max-size: "10m"
         max-file: "1"
     network_mode: host
     depends_on:
-      - telematic_web_server
+      - web_server
 
   apache2:
     build:
       context: "./telematic_apps/apache2"
       dockerfile: "./local.Dockerfile"
     restart: always
+    container_name: apache2
     logging:
       options:
         max-size: "10m"
@@ -149,15 +155,16 @@ services:
       - UISERVICE_LOCAL_UPLOAD_URL=http://127.0.0.1:9011/
     depends_on:
       - grafana
-      - telematic_web_client
-      - telematic_web_server
+      - web_client
+      - web_server
     volumes:
       - /opt/apache2/grafana_htpasswd:/etc/apache2/grafana_htpasswd
 
-  telematic_messaging_server:
+  messaging_server:
     build:
       context: "./telematic_cloud_messaging"
       dockerfile: "local.Dockerfile"
+    container_name: messaging_server
     depends_on:
       - nats
       - mysqldb
@@ -175,12 +182,12 @@ services:
       - WAIT_SLEEP_INTERVAL=5
       - WAIT_HOST_CONNECT_TIMEOUT=30
 
-  rosbag2-processing-service:
+  rosbag2_processing_service:
     build:
           context: ./telematic_historical_data_processing
           dockerfile: Dockerfile
           network: host
-    image: usdotfhwastoldev/rosbag2_processing_service:develop
+    container_name: rosbag2_processing_service
     restart: always
     depends_on:
       - nats
@@ -190,7 +197,6 @@ services:
       options:
         max-size: "2g"
         max-file: "1"
-    container_name: rosbag2_processing_service
     network_mode: host
     entrypoint: /ws/entrypoint.sh
     volumes:

diff --git a/telematic_system/docker-compose.units.yml b/telematic_system/docker-compose.units.yml
@@ -1,6 +1,6 @@
 version: "3.4"
 services:
-  ros2-nats-bridge:
+  ros2_nats_bridge:
     build:
           context: ./telematic_units/carma_vehicle_bridge
           dockerfile: Dockerfile
@@ -9,7 +9,7 @@ services:
       options:
         max-size: "2g"
         max-file: "1"
-    container_name: carma_vehicle_bridge
+    container_name: ros2_nats_bridge
     network_mode: host
     entrypoint: /ws/ros_entrypoint.sh
     volumes:
@@ -28,7 +28,7 @@ services:
     - VEHICLE_BRIDGE_EXCLUSION_LIST= ${VEHICLE_BRIDGE_EXCLUSION_LIST} #OPTIONAL variable to set a comma separated list of topics not available to publish, leave empty if none
     - IS_SIM=False #OPTIONAL variable to treat incoming messages as coming from simulation env.  In this case the bridge will use system time as message timestamp. Defaults to False.
 
-  streets-nats-bridge:
+  streets_nats_bridge:
     build:
           context: ./telematic_units/carma_street_bridge
           dockerfile: Dockerfile
@@ -37,7 +37,7 @@ services:
       options:
         max-size: "2g"
         max-file: "1"
-    container_name: carma_street_bridge
+    container_name: streets_nats_bridge
     network_mode: host
     volumes:
            - ./logs:/var/logs
@@ -56,7 +56,7 @@ services:
     - STREETS_BRIDGE_EXCLUSION_LIST= ${STREETS_BRIDGE_EXCLUSION_LIST} #OPTIONAL variable to set a comma separated list of topics not available to publish, leave empty if none
     - IS_SIM=False #OPTIONAL variable to treat incoming messages as coming from simulation env.  In this case the bridge will use system time as message timestamp. Defaults to False.
 
-  cloud-nats-bridge:
+  cloud_nats_bridge:
     build:
           context: ./telematic_units/carma_cloud_bridge
           dockerfile: Dockerfile
@@ -65,7 +65,7 @@ services:
       options:
         max-size: "2g"
         max-file: "1"
-    container_name: carma_cloud_bridge
+    container_name: cloud_nats_bridge
     network_mode: host
     volumes:
            - ./logs:/var/logs

diff --git a/telematic_system/docker-compose.webapp.yml b/telematic_system/docker-compose.webapp.yml
@@ -1,9 +1,10 @@
 version: "3"
 services:
-  telematic_web_server:
+  web_server:
       build:
         context: "./telematic_apps/web_app/server"
       restart: always
+      container_name: web_server
       logging:
         options:
           max-size: "10m"
@@ -41,24 +42,26 @@ services:
         - /opt/apache2/grafana_htpasswd:/opt/apache2/grafana_htpasswd
         - /opt/telematics/upload:/opt/telematics/upload
 
-  telematic_web_client:
+  web_client:
     build:
       context: "./telematic_apps/web_app/client"
     restart: always
+    container_name: web_client
     logging:
       options:
         max-size: "10m"
         max-file: "1"
     network_mode: host
     depends_on:
-      - telematic_web_server
+      - web_server
     volumes:
       - ./web_client.production.env.js:/usr/share/nginx/html/env.js
 
   apache2:
     build:
       context: "./telematic_apps/apache2"
     restart: always
+    container_name: apache2
     logging:
       options:
         max-size: "10m"
@@ -72,15 +75,16 @@ services:
       - UISERVICE_LOCAL_UPLOAD_URL=http://127.0.0.1:9011/
     depends_on:
       - grafana
-      - telematic_web_client
-      - telematic_web_server
+      - web_client
+      - web_server
     volumes:
       - /opt/apache2/grafana_htpasswd:/etc/apache2/grafana_htpasswd
 
   grafana:
     build:
       context: "./telematic_apps/grafana"
     restart: always
+    container_name: grafana
     logging:
       options:
         max-size: "10m"