diff --git a/Dockerfile b/Dockerfile index 6b5dc57..e9ae107 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,9 +23,6 @@ ENV __GL_SYNC_TO_VBLANK 0 ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} # Enable AppImage execution in a container ENV APPIMAGE_EXTRACT_AND_RUN 1 -# Add configuration for Selkies-GStreamer Joystick interposer -ENV LD_PRELOAD /usr/local/lib/selkies-js-interposer/joystick_interposer.so${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -ENV SDL_JOYSTICK_DEVICE /dev/input/js0 # System defaults that should not be changed ENV DISPLAY :0 ENV XDG_RUNTIME_DIR /tmp/runtime-user @@ -473,6 +470,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ curl -fsSL "https://github.com/selkies-project/selkies-gstreamer/releases/download/v${SELKIES_VERSION}/selkies-gstreamer-web-v${SELKIES_VERSION}.tgz" | tar -zxf - && \ curl -O -fsSL "https://github.com/selkies-project/selkies-gstreamer/releases/download/v${SELKIES_VERSION}/selkies-js-interposer-v${SELKIES_VERSION}-ubuntu${UBUNTU_RELEASE}.deb" && apt-get update && apt-get install --no-install-recommends -y "./selkies-js-interposer-v${SELKIES_VERSION}-ubuntu${UBUNTU_RELEASE}.deb" && rm -f "selkies-js-interposer-v${SELKIES_VERSION}-ubuntu${UBUNTU_RELEASE}.deb" && rm -rf /var/lib/apt/lists/* && \ cd /usr/local/cuda/lib64 && sudo find . -maxdepth 1 -type l -name "*libnvrtc.so.*" -exec sh -c 'ln -snf $(basename {}) libnvrtc.so' \; +# Add configuration for Selkies-GStreamer Joystick interposer +ENV LD_PRELOAD /usr/local/lib/selkies-js-interposer/joystick_interposer.so${LD_PRELOAD:+:${LD_PRELOAD}} +ENV SDL_JOYSTICK_DEVICE /dev/input/js0 # Install the noVNC web interface and the latest x11vnc for fallback RUN apt-get update && apt-get install --no-install-recommends -y \