Skip to content

Commit 27f0ed1

Browse files
Update docker-compose files to use DOCKER_IMAGE_TAG instead of PROJECT_VERSION
1 parent bb1b86b commit 27f0ed1

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This top-level .env file under AirStack/ defines variables that are propagated through docker-compose.yaml
22
PROJECT_NAME="airstack"
3-
DOCKER_IMAGE_TAG="4e6cae1" # auto-generated from git commit hash
3+
DOCKER_IMAGE_TAG="bb1b86b" # auto-generated from git commit hash
44
# can replace with your docker hub username
55
PROJECT_DOCKER_REGISTRY="airlab-storage.andrew.cmu.edu:5001/shared"
66
DEFAULT_ISAAC_SCENE="omniverse://airlab-storage.andrew.cmu.edu:8443/Projects/AirStack/AFCA/fire_academy_faro_with_sky.scene.usd"

docs/docker/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
- ""
66
- sitl
77
- hitl
8-
image: &image_tag ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${PROJECT_VERSION}_mkdocs
8+
image: &image_tag ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${DOCKER_IMAGE_TAG}_mkdocs
99
build:
1010
dockerfile: ./Dockerfile
1111
tags:

ground_control_station/docker/ground-control-station-base-docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# docker compose file
22
services:
33
ground-control-station-base:
4-
image: &gcs_image ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${PROJECT_VERSION}_gcs
4+
image: &gcs_image ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${DOCKER_IMAGE_TAG}_gcs
55
build:
66
context: ../
77
dockerfile: docker/Dockerfile.gcs

robot/docker/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
extends:
1111
file: ./robot-base-docker-compose.yaml
1212
service: robot_base
13-
image: &desktop_image ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${PROJECT_VERSION}_robot-x86-64
13+
image: &desktop_image ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${DOCKER_IMAGE_TAG}_robot-x86-64
1414
build:
1515
dockerfile: ./Dockerfile.robot
1616
args:
@@ -42,7 +42,7 @@ services:
4242
extends:
4343
file: ./robot-base-docker-compose.yaml
4444
service: robot_base
45-
image: &l4t_image ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${PROJECT_VERSION}_robot-l4t
45+
image: &l4t_image ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${DOCKER_IMAGE_TAG}_robot-l4t
4646
build:
4747
dockerfile: ./Dockerfile.robot
4848
args:

simulation/isaac-sim/docker/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
isaac-sim:
3-
image: &image_tag ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${PROJECT_VERSION}_isaac-sim
3+
image: &image_tag ${PROJECT_DOCKER_REGISTRY}/${PROJECT_NAME}:v${DOCKER_IMAGE_TAG}_isaac-sim
44
build:
55
context: ../
66
dockerfile: docker/Dockerfile.isaac-ros
@@ -58,7 +58,7 @@ services:
5858
# developer stuff
5959
- .dev:/root/.dev:rw # developer config
6060
- .bashrc:/root/.bashrc:rw # bash config
61-
- ../../common/inputrc:/etc/inputrc:rw # for using page up/down to search through command history
61+
- ../../common/inputrc:/etc/inputrc:rw # for using page up/down to search through command history
6262
# code
6363
- ../sitl_integration/kit-app-template/source/extensions/:/root/Documents/Kit/shared/exts/
6464
- ../sitl_integration:/sitl_integration:rw

0 commit comments

Comments
 (0)