From 277d4e77978b6b547e70020ba7affa7fb0685bd7 Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 6 Aug 2024 17:32:54 -0400 Subject: [PATCH] refresh alpine-icewm --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- root/defaults/startwm.sh | 18 ++++++++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c0f98565..6a1edcf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:3.20 +FROM ghcr.io/linuxserver/baseimage-rdesktop:alpine320 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index bbcf19d5..95753f99 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-alpine320 # set version label ARG BUILD_DATE diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh index a861e0c3..4bbf0f9c 100755 --- a/root/defaults/startwm.sh +++ b/root/defaults/startwm.sh @@ -1,5 +1,19 @@ #!/bin/bash + +# Combine env +/usr/bin/with-contenv /usr/bin/env | sed 's/^/export /g' > /defaults/env.sh +source /defaults/env.sh +rm /defaults/env.sh + +# Enable Nvidia GPU support if detected +if which nvidia-smi; then + export LIBGL_KOPPER_DRI2=1 + export MESA_LOADER_DRIVER_OVERRIDE=zink + export GALLIUM_DRIVER=zink +fi + +# Start Pulseaudio /startpulse.sh & -setterm blank 0 -setterm powerdown 0 + +# Launch DE /usr/bin/icewm-session > /dev/null 2>&1