diff --git a/Dockerfile b/Dockerfile index 129487be..750f4332 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:3.18 +FROM ghcr.io/linuxserver/baseimage-rdesktop:3.19 # set version label ARG BUILD_DATE @@ -10,16 +10,12 @@ LABEL maintainer="thelamer" RUN \ echo "**** install packages ****" && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - icewm && \ apk add --no-cache \ - chromium \ + firefox \ + icewm \ st \ util-linux-misc && \ echo "**** application tweaks ****" && \ - mv \ - /usr/bin/chromium-browser \ - /usr/bin/chromium-real && \ ln -s \ /usr/bin/st \ /usr/bin/x-terminal-emulator && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3ee7ba05..1ece0b84 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.19 # set version label ARG BUILD_DATE @@ -10,16 +10,11 @@ LABEL maintainer="thelamer" RUN \ echo "**** install packages ****" && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - icewm && \ apk add --no-cache \ - chromium \ + firefox \ st \ util-linux-misc && \ echo "**** application tweaks ****" && \ - mv \ - /usr/bin/chromium-browser \ - /usr/bin/chromium-real && \ ln -s \ /usr/bin/st \ /usr/bin/x-terminal-emulator && \ diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh index 249360bb..a861e0c3 100755 --- a/root/defaults/startwm.sh +++ b/root/defaults/startwm.sh @@ -1,3 +1,5 @@ #!/bin/bash /startpulse.sh & +setterm blank 0 +setterm powerdown 0 /usr/bin/icewm-session > /dev/null 2>&1 diff --git a/root/usr/bin/chromium-browser b/root/usr/bin/chromium-browser deleted file mode 100755 index 4c9655a0..00000000 --- a/root/usr/bin/chromium-browser +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -BIN=/usr/bin/chromium-real - -# Run normally on privved containers or modified un non priv -if grep -q 'Seccomp: 0' /proc/1/status; then - ${BIN} --password-store=basic "$@" -else - ${BIN} --password-store=basic --no-sandbox --test-type "$@" -fi