fix merge
This commit is contained in:
2025-09-05 16:26:53 +02:00
2 changed files with 13 additions and 8 deletions

View File

@@ -1,10 +1,10 @@
FROM osrf/ros:jazzy-desktop-full-noble FROM osrf/ros:jazzy-desktop-full-noble
SHELL [ "/bin/bash" , "-c" ]
USER ubuntu USER ubuntu
# Add sourcing ROS setup.bash to .bashrc # Add sourcing ROS setup.bash to .bashrc
RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc
RUN echo "source /usr/share/colcon_cd/function/colcon_cd.sh" >> ~/.bashrc RUN echo "source /usr/share/colcon_cd/function/colcon_cd.sh" >> ~/.bashrc
RUN echo "source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash" >> ~/.bashrc RUN echo "source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash" >> ~/.bashrc
RUN echo "export _colcon_cd_root=/opt/ros/jazzy/" >> ~/.bashrc RUN echo "export _colcon_cd_root=/opt/ros/jazzy/" >> ~/.bashrc
SHELL [ "/bin/bash" , "-c" ]

View File

@@ -14,11 +14,11 @@
], ],
"workspaceMount": "source=${localWorkspaceFolder},target=/${localWorkspaceFolderBasename},type=bind", "workspaceMount": "source=${localWorkspaceFolder},target=/${localWorkspaceFolderBasename},type=bind",
"workspaceFolder": "/${localWorkspaceFolderBasename}", "workspaceFolder": "/${localWorkspaceFolderBasename}",
// for linux "remoteEnv": {
"containerEnv": { "DISPLAY": "${localEnv:DISPLAY}",
// Uncomment to allow the container to access the X server on the host e.g. to run Rviz and other GUI tools "TZ": "Europe/Amsterdam",
"DISPLAY": "${localEnv:DISPLAY}", "DBUS_SESSION_BUS_ADDRESS": "unix:path=/run/user/1000/bus",
"TZ": "Europe/Amsterdam" "XDG_RUNTIME_DIR": "/run/user/1000"
}, },
"mounts": [ "mounts": [
// Uncomment to allow the container to access the X server on the host e.g. to run Rviz and other GUI tools // Uncomment to allow the container to access the X server on the host e.g. to run Rviz and other GUI tools
@@ -38,6 +38,11 @@
"source": "/dev/dri", "source": "/dev/dri",
"target": "/dev/dri", "target": "/dev/dri",
"type": "bind" "type": "bind"
},
{
"source": "/run/user/1000/bus",
"target": "/run/user/1000/bus",
"type": "bind"
} }
], ],
"customizations": { "customizations": {