From 58187335e403074fe22810c2bb156c2bebc8afee Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 29 Dec 2023 22:47:14 -0800 Subject: [PATCH] rebase alpine-icewm to 3.19 swap to firefox --- Dockerfile | 10 +++------- Dockerfile.aarch64 | 10 +++------- root/usr/bin/chromium-browser | 10 ---------- 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100755 root/usr/bin/chromium-browser diff --git a/Dockerfile b/Dockerfile index 8b92aaab..dbc9e29a 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 @@ -9,16 +9,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 23ab1a8f..5a004bb9 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 @@ -9,16 +9,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/root/usr/bin/chromium-browser b/root/usr/bin/chromium-browser deleted file mode 100755 index 5887b478..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