fixes

Author: alaurenzi

docker-base

@@ -4,15 +4,13 @@ services:
     extends:
       file: ../kyon-cetc-focal-ros1/compose.yml
       service: base
-    image: hhcmhub/kyon-cetc-focal-ros1-xeno-v${KERNEL_VER}:v1.0.0
+    image: hhcmhub/kyon-cetc-focal-ros1-xeno-v${KERNEL_VER}:master
     restart: always
     cap_add:
       - ALL
     volumes:
       - /dev:/dev
       - /usr/lib/modules:/usr/lib/modules
-      # Mount the kyon_config repository root into the container
-      - ../../:/home/kyon_ros1/xbot2_ws/src/kyon_config
     environment:
       - CUSTOM_PS=(dev)
 

docker/kyon-cetc-focal-ros1-xeno/compose.yml

@@ -1,7 +1,7 @@
 services:
 
   base:
-    image: hhcmhub/kyon-cetc-focal-ros1-base:v1.0.0
+    image: hhcmhub/kyon-cetc-focal-ros1-base:master
     stdin_open: true
     tty: true 
     privileged: true
@@ -14,30 +14,31 @@ services:
       core: -1
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw  # x11
-      - ~/.ssh:/home/kyon_ros1/.ssh  # ssh
+      - ~/.ssh:/home/user/.ssh  # ssh
       - /dev:/dev
       # Mount the kyon_config repository root into the container
-      - ../../:/home/kyon_ros1/xbot2_ws/src/kyon_config
+      - ../../:/home/user/xbot2_ws/src/kyon_config:ro
     environment:
       - TERM=xterm-256color
       - DISPLAY
       - HHCM_FOREST_CLONE_DEFAULT_PROTO=https
+      - ROBOT_CONFIG_PATH=/home/user/xbot2_ws/src/kyon_config/setup.sh
       - ROS_MASTER_URI
       - ROS_IP
 
   dev:
     extends: base 
     restart: always
     volumes:
-      - ~/.cache/kyon-cetc-focal-ros1-base:/home/kyon_ros1/data
+      - ~/.cache/kyon-cetc-focal-ros1-base:/home/user/data
     environment:
       - CUSTOM_PS=(dev)
 
   dev-nvidia:
     extends: dev 
     restart: always
     volumes:
-      - ~:/home/kyon_ros1/host
+      - ~:/home/user/host
     environment:
       - NVIDIA_DRIVER_CAPABILITIES=all
       - NVIDIA_VISIBLE_DEVICES=all

docker/kyon-cetc-focal-ros1/compose.yml

@@ -18,7 +18,7 @@ services:
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw  # x11
       - ~/.ssh:/home/user/.ssh  # ssh
-      - ../../:/home/user/xbot2_ws/src/kyon_config
+      - ../../:/home/user/xbot2_ws/src/kyon_config:ro
     environment:
       - TERM=xterm-256color
       - DISPLAY
@@ -43,7 +43,7 @@ services:
 
   xbot2_gui_server:
     extends: base
-    entrypoint: bash -ic "cd ~/xbot2_ws/src/kyon_config; git pull origin master; xbot2_gui_server gui/ros2/gui_server_config.yaml; bash"
+    entrypoint: bash -ic "cd ~/xbot2_ws/src/kyon_config; xbot2_gui_server gui/ros2/gui_server_config.yaml; bash"
     restart: always
     environment:
-      - CUSTOM_PS="(xbot2_gui_server) "
+      - CUSTOM_PS=(xbot2_gui_server)

docker/kyon-cetc-noble-ros2-xeno/compose.yml

@@ -19,11 +19,12 @@ services:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw  # x11
       - ~/.ssh:/home/user/.ssh  # ssh
       # Mount the kyon_config repository root into the container
-      - ../../:/home/user/xbot2_ws/src/kyon_config
+      - ../../:/home/user/xbot2_ws/src/kyon_config:ro
     environment:
       - TERM=xterm-256color
       - DISPLAY
       - HHCM_FOREST_CLONE_DEFAULT_PROTO=https
+      - ROBOT_CONFIG_PATH=/home/user/xbot2_ws/src/kyon_config/setup.sh
 
   dev:
     extends: base