From 5332f78be4123e9dce48c7fe6d7ff7d3e89026fc Mon Sep 17 00:00:00 2001
From: Andrey Arapov <andrey.arapov@nixaid.com>
Date: Fri, 29 Apr 2016 21:54:22 +0200
Subject: [PATCH] do not use steam runtime

---
 Dockerfile         | 11 ++++++++---
 docker-compose.yml |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cfb19c1..a5db7df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,11 +37,13 @@ RUN echo "deb [arch=amd64,i386] http://repo.steampowered.com/steam/ precise stea
     apt-get -y upgrade && \
     apt-get -y dist-upgrade && \
     apt-get -fy install && \
-    apt-get -y install binutils pciutils pulseaudio mesa-utils steam && \
+    apt-get -y install binutils pciutils pulseaudio mesa-utils libcanberra-gtk-module \
+                       libopenal1 libnss3 libgconf-2-4 libxss1 libnm-glib4 libnm-util2 steam && \
     rm -f /etc/apt/sources.list.d/tmp-steam.list && \
     rm -rf /var/lib/apt/lists
 
-# COPY [ "nvidia-340-mini", "/usr/lib/nvidia-340" ]
+# Not sure whether we really need these:
+# libcurl3 libcanberra-gtk-module
 
 # Install NVIDIA Drivers.
 # Currently supported versions: 304, 340, 361
@@ -70,7 +72,7 @@ RUN locale-gen en_US.UTF-8 && \
     update-locale
 
 # Workaround missing lib in .local/share/Steam/ubuntu12_32/steamclient.so
-RUN ln -sv /lib/i386-linux-gnu/libudev.so.1 /lib/i386-linux-gnu/libudev.so.0
+RUN ln -sv libudev.so.1 /lib/i386-linux-gnu/libudev.so.0
 
 # Workaround: pulseaudio client library eager to remove /dev/shm/pulse-shm-* files created by the host,
 #             causing sound to stop working
@@ -85,5 +87,8 @@ RUN useradd -m -d $HOME -u $UID -G $GROUPS $USER
 
 USER $USER
 WORKDIR $HOME
+
+ENV STEAM_RUNTIME 0
+
 COPY ./launch /launch
 ENTRYPOINT [ "/launch" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index d5fde40..28398a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,4 +25,6 @@ services:
     environment:
       - DISPLAY=unix$DISPLAY
       - PULSE_SERVER=unix:$XDG_RUNTIME_DIR/pulse/native
-      # - STEAM_RUNTIME=0
+      # Use Steam provided runtime, requires --reset
+      # Steam provided runtime seems to be less stable with this image
+      # - STEAM_RUNTIME=1