From 963455f88c436e0b9268b6fcb28e304713857bf6 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 20 Feb 2024 09:36:00 -0500 Subject: [PATCH] Fix dev containers for user overlays --- .env | 5 +++-- docker-compose.yaml | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.env b/.env index df7f6da8..26b768b9 100644 --- a/.env +++ b/.env @@ -10,7 +10,8 @@ STUDIO_DOCKER_TAG=main # Licensing -- enter your MoveIt Pro license below STUDIO_LICENSE_KEY= -# User name and UID to use when building the container +# User name, UID, and GID to use when building the container # Ensure these settings match your host environment for mounted file permissions. -USERNAME= +STUDIO_USERNAME= STUDIO_USER_UID= +STUDIO_USER_GID= diff --git a/docker-compose.yaml b/docker-compose.yaml index d893ced3..a2e08320 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,9 +8,9 @@ services: # Extend the installed MoveIt Pro docker compose file. # Change this to match your environment, if MoveIt Pro was installed to a different location. extends: - file: ${HOME}/moveit_studio/docker-compose.yaml + file: ${HOME}/moveit_pro/docker-compose.yaml service: base - image: moveit-studio-overlay + image: moveit-pro-overlay build: context: . target: user-overlay @@ -96,10 +96,10 @@ services: privileged: true volumes: # Mount the source code, colcon generated artifacts, and ccache - - ./src/:/home/${STUDIO_USERNAME:-studio-user}/user_overlay_ws/src:rw - - ./build/:/home/${STUDIO_USERNAME:-studio-user}/user_overlay_ws/build:rw - - ./install/:/home/${STUDIO_USERNAME:-studio-user}/user_overlay_ws/install:rw - - ./log/:/home/${STUDIO_USERNAME:-studio-user}/user_overlay_ws/log:rw + - ./src/:/home/${STUDIO_USERNAME:-studio-user}/user_ws/src:rw + - ./build/:/home/${STUDIO_USERNAME:-studio-user}/user_ws/build:rw + - ./install/:/home/${STUDIO_USERNAME:-studio-user}/user_ws/install:rw + - ./log/:/home/${STUDIO_USERNAME:-studio-user}/user_ws/log:rw - ./.ccache/:/home/${STUDIO_USERNAME:-studio-user}/.ccache:rw - ${HOME}/.ros/log_moveit_pro:/home/${STUDIO_USERNAME:-studio-user}/.ros/log # Allow access to host hardware e.g. RealSense cameras