fix: Move user and group id to environment file

2b-t · Apr 6, 2024 · 0bd6a71 · 0bd6a71
1 parent fc1a252
commit 0bd6a71
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/templates/ros/docker/.env b/templates/ros/docker/.env
@@ -1,5 +1,6 @@
-CATKIN_WORKSPACE_DIR="/catkin_ws"
-YOUR_IP="127.0.0.1"
-ROBOT_IP="127.0.0.1"
-ROBOT_HOSTNAME="P500"
-
+CATKIN_WORKSPACE_DIR=/catkin_ws
+YOUR_IP=127.0.0.1
+ROBOT_IP=127.0.0.1
+ROBOT_HOSTNAME=P500
+UID=1000
+GID=1000
diff --git a/templates/ros/docker/docker-compose.yml b/templates/ros/docker/docker-compose.yml
@@ -8,8 +8,8 @@ services:
       args:
         - CATKIN_WORKSPACE_DIR=${CATKIN_WORKSPACE_DIR}
         - USERNAME=${USERNAME:-developer}
-        - UID=${UID:-1000}
-        - GID=${UID:-1000}
+        - UID=${UID}
+        - GID=${GID}
     container_name: ros_docker
     environment:
       - ROS_MASTER_URI=http://${ROBOT_IP}:11311

diff --git a/templates/ros2/docker/.env b/templates/ros2/docker/.env
@@ -1,6 +1,7 @@
-AMENT_WORKSPACE_DIR="/ament_ws"
+AMENT_WORKSPACE_DIR=/ament_ws
 ROS_DOMAIN_ID=0
-YOUR_IP="127.0.0.1"
-ROBOT_IP="127.0.0.1"
-ROBOT_HOSTNAME="P500"
-
+YOUR_IP=127.0.0.1
+ROBOT_IP=127.0.0.1
+ROBOT_HOSTNAME=P500
+UID=1000
+GID=1000
diff --git a/templates/ros2/docker/docker-compose.yml b/templates/ros2/docker/docker-compose.yml
@@ -8,8 +8,8 @@ services:
       args:
         - AMENT_WORKSPACE_DIR=${AMENT_WORKSPACE_DIR}
         - USERNAME=${USERNAME:-developer}
-        - UID=${UID:-1000}
-        - GID=${UID:-1000}
+        - UID=${UID}
+        - GID=${GID}
     container_name: ros2_docker
     environment:
       - ROS_DOMAIN_ID=${ROS_DOMAIN_ID}