docker compose update 2
This commit is contained in:
@@ -38,24 +38,21 @@ x-common: &common
|
|||||||
count: all
|
count: all
|
||||||
capabilities: [ gpu ]
|
capabilities: [ gpu ]
|
||||||
|
|
||||||
# Environment variables for Wayland + GPU
|
# Environment variables - use XWayland for OpenGL compatibility
|
||||||
environment:
|
environment:
|
||||||
# Wayland display
|
# X11/XWayland display (better for OpenGL in containers)
|
||||||
&common-env
|
&common-env
|
||||||
- WAYLAND_DISPLAY=${WAYLAND_DISPLAY:-wayland-0}
|
|
||||||
- XDG_RUNTIME_DIR=/run/user/1000
|
|
||||||
# Fallback X11 (XWayland)
|
|
||||||
- DISPLAY=${DISPLAY:-:0}
|
- DISPLAY=${DISPLAY:-:0}
|
||||||
|
- XDG_RUNTIME_DIR=/run/user/1000
|
||||||
# GPU
|
# GPU
|
||||||
- NVIDIA_VISIBLE_DEVICES=all
|
- NVIDIA_VISIBLE_DEVICES=all
|
||||||
- NVIDIA_DRIVER_CAPABILITIES=all
|
- NVIDIA_DRIVER_CAPABILITIES=all
|
||||||
# Qt platform - prefer Wayland, fallback to XCB
|
# Force X11/XCB for Qt (more stable for OpenGL than native Wayland)
|
||||||
- QT_QPA_PLATFORM=wayland;xcb
|
- QT_QPA_PLATFORM=xcb
|
||||||
- QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
|
||||||
- QT_X11_NO_MITSHM=1
|
- QT_X11_NO_MITSHM=1
|
||||||
# OpenGL
|
# OpenGL settings
|
||||||
- __GLX_VENDOR_LIBRARY_NAME=nvidia
|
- __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||||
- GDK_BACKEND=wayland,x11
|
- LIBGL_ALWAYS_SOFTWARE=0
|
||||||
# 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
|
||||||
|
|||||||
Reference in New Issue
Block a user