arno/steam
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Andy 2016-08-06 18:20:55 +02:00
parent bb3f8c0426
commit f1f3812aa6
Signed by: arno
GPG Key ID: 368DDA2E9A471EAC
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docker-compose.yml
View File

@ -16,21 +16,21 @@ services:
- data:/home
# - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket:ro
# Ubuntu's NVIDIA driver:
- /usr/lib/nvidia-361-prime:/h1:ro
- /usr/lib/nvidia-340:/h2:ro
- /usr/lib/nvidia-340-prime:/h3:ro
- /usr/lib/nvidia-304:/h4:ro
- /usr/lib32/nvidia-361:/h5:ro
- /usr/lib32/nvidia-340:/h6:ro
- /usr/lib32/nvidia-304:/h7:ro
# openSUSE's NVIDIA driver:
- /usr/X11R6/lib:/h10:ro
- /usr/X11R6/lib64:/h11:ro
- /usr/lib:/h12:ro
- /usr/lib64:/h13:ro
- /usr/lib/nvidia-361-prime:/h1_64:ro
- /usr/lib/nvidia-340:/h2_64:ro
- /usr/lib/nvidia-340-prime:/h3_64:ro
- /usr/lib/nvidia-304:/h4_64:ro
- /usr/lib32/nvidia-361:/h5_32:ro
- /usr/lib32/nvidia-340:/h6_32:ro
- /usr/lib32/nvidia-304:/h7_32:ro
# Ubuntu's generic libGL:
- /usr/lib/x86_64-linux-gnu:/h8:ro
- /usr/lib/i386-linux-gnu:/h9:ro
- /usr/lib/x86_64-linux-gnu:/h8_64:ro
- /usr/lib/i386-linux-gnu:/h9_32:ro
# openSUSE's NVIDIA driver:
- /usr/X11R6/lib:/h10_32:ro
- /usr/X11R6/lib64:/h11_64:ro
- /usr/lib:/h12_32:ro
- /usr/lib64:/h13_64:ro
devices:
- /dev/nvidia0
- /dev/nvidiactl

11
launch
View File

@ -44,6 +44,15 @@ fi
#
# Make sure the Steam docker image's paths are coming first
# and then the hosts's (/h1..20) mounted ones
export LD_LIBRARY_PATH="/usr/lib:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(echo /h{1..20} | tr ' ' ':')"
export LD_LIBRARY_PATH="/lib:/lib64:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(echo /h{1..20}_{32,64} | tr ' ' ':')"
# GOOD export LD_LIBRARY_PATH="/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(echo /h{1..20}_{32,64} | tr ' ' ':')"
#
# In order to avoid the inconsistency error, when launching `csgo_linux64`
# Inconsistency detected by ld.so: dl-open.c: 689: _dl_open: Assertion `_dl_debug_initialize (0, args.nsid)->r_state == RT_CONSISTENT' failed!
# Hint: to find out what's wrong, use `strace`
#
# 1) openSUSE's libpulsecommon-7.0.so vs Ubuntu's libpulsecommon-5.0.so
export LD_PRELOAD=$(find /h{1..20}_{32,64} -name "*libpulsecommon*" 2>/dev/null)
su -p user -c "steam $@"