From 6a8c0d071f732093831e7206045751fa03b6ef6e Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Fri, 29 Dec 2023 15:57:29 -0800 Subject: [PATCH] rebase alpine-mate to 3.19 swap to firefox (#197) --- Dockerfile | 8 ++------ Dockerfile.aarch64 | 8 ++------ root/usr/local/bin/wrapped-chromium | 10 ---------- 3 files changed, 4 insertions(+), 22 deletions(-) delete mode 100755 root/usr/local/bin/wrapped-chromium diff --git a/Dockerfile b/Dockerfile index 954965e1..a6d35349 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319 # set version label ARG BUILD_DATE @@ -11,13 +11,9 @@ LABEL maintainer="thelamer" RUN \ echo "**** install packages ****" && \ apk add --no-cache \ - chromium \ + firefox \ mate-desktop-environment \ util-linux-misc && \ - echo "**** application tweaks ****" && \ - sed -i \ - 's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \ - /usr/share/applications/chromium.desktop && \ echo "**** mate tweaks ****" && \ sed -i \ '/compositing-manager/{n;s/.*/ false<\/default>/}' \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a262404c..470e1205 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319 # set version label ARG BUILD_DATE @@ -11,13 +11,9 @@ LABEL maintainer="thelamer" RUN \ echo "**** install packages ****" && \ apk add --no-cache \ - chromium \ + firefox \ mate-desktop-environment \ util-linux-misc && \ - echo "**** application tweaks ****" && \ - sed -i \ - 's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \ - /usr/share/applications/chromium.desktop && \ echo "**** mate tweaks ****" && \ sed -i \ '/compositing-manager/{n;s/.*/ false<\/default>/}' \ diff --git a/root/usr/local/bin/wrapped-chromium b/root/usr/local/bin/wrapped-chromium deleted file mode 100755 index 7c4cb51a..00000000 --- a/root/usr/local/bin/wrapped-chromium +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/bash - -BIN=/usr/bin/chromium-browser - -# 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