SirBlob/RDC_Simulation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docker Update 5

Browse Source
This commit is contained in:
default
2026-01-11 00:37:32 +00:00
parent 0b60a29c73
commit f531e3ec41
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -168,9 +168,9 @@ RUN mkdir -p build && cd build \
&& make -j$(nproc) && make -j$(nproc)
# ============================================================================= # =============================================================================
# PYTHON DEPENDENCIES (MAVProxy, pymavlink) # PYTHON DEPENDENCIES (MAVProxy, pymavlink, empy)
# ============================================================================= # =============================================================================
RUN pip3 install --user --break-system-packages pymavlink mavproxy pexpect pybullet numpy pillow opencv-python RUN pip3 install --user --break-system-packages pymavlink mavproxy pexpect pybullet numpy pillow opencv-python empy==3.3.4
# ============================================================================= # =============================================================================
# COPY PROJECT FILES # COPY PROJECT FILES

16
docker-compose.yml
View File

@@ -38,21 +38,23 @@ x-common: &common
count: all count: all
capabilities: [ gpu ] capabilities: [ gpu ]
# Environment variables - use XWayland for OpenGL compatibility # Environment variables - Wayland with GPU
environment: environment:
# X11/XWayland display (better for OpenGL in containers) # Wayland display
&common-env &common-env
- DISPLAY=${DISPLAY:-:0} - WAYLAND_DISPLAY=${WAYLAND_DISPLAY:-wayland-0}
- XDG_RUNTIME_DIR=/run/user/1000 - XDG_RUNTIME_DIR=/run/user/1000
# X11 fallback
- DISPLAY=${DISPLAY:-:0}
# GPU # GPU
- NVIDIA_VISIBLE_DEVICES=all - NVIDIA_VISIBLE_DEVICES=all
- NVIDIA_DRIVER_CAPABILITIES=all - NVIDIA_DRIVER_CAPABILITIES=all
# Force X11/XCB for Qt (more stable for OpenGL than native Wayland) # Qt platform - Wayland first, then X11
- QT_QPA_PLATFORM=xcb - QT_QPA_PLATFORM=wayland
- QT_X11_NO_MITSHM=1 - QT_WAYLAND_DISABLE_WINDOWDECORATION=1
# OpenGL settings # OpenGL settings
- __GLX_VENDOR_LIBRARY_NAME=nvidia - __GLX_VENDOR_LIBRARY_NAME=nvidia
- LIBGL_ALWAYS_SOFTWARE=0 - __NV_PRIME_RENDER_OFFLOAD=1
# Gazebo paths # Gazebo paths
- GZ_SIM_SYSTEM_PLUGIN_PATH=/home/pilot/ardupilot_gazebo/build - GZ_SIM_SYSTEM_PLUGIN_PATH=/home/pilot/ardupilot_gazebo/build
- GZ_SIM_RESOURCE_PATH=/home/pilot/ardupilot_gazebo/models:/home/pilot/ardupilot_gazebo/worlds:/home/pilot/RDC_Simulation/gazebo/models - GZ_SIM_RESOURCE_PATH=/home/pilot/ardupilot_gazebo/models:/home/pilot/ardupilot_gazebo/worlds:/home/pilot/RDC_Simulation/gazebo/models