From 3fc4d5141495bfe5959e27702c91b568ef9e6452 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 26 Sep 2024 08:46:28 -0400 Subject: [PATCH] swap alpine xfce to chromium --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- README.md | 1 + readme-vars.yml | 1 + root/usr/bin/chromium | 15 +++++++++++++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100755 root/usr/bin/chromium diff --git a/Dockerfile b/Dockerfile index 0e6bc328..fb7f2218 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,10 +17,10 @@ RUN \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \ echo "**** install packages ****" && \ apk add --no-cache \ + chromium \ faenza-icon-theme \ faenza-icon-theme-xfce4-appfinder \ faenza-icon-theme-xfce4-panel \ - firefox \ mousepad \ ristretto \ thunar \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 99b93730..b2f5fb65 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -17,10 +17,10 @@ RUN \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \ echo "**** install packages ****" && \ apk add --no-cache \ + chromium \ faenza-icon-theme \ faenza-icon-theme-xfce4-appfinder \ faenza-icon-theme-xfce4-panel \ - firefox \ mousepad \ ristretto \ thunar \ diff --git a/README.md b/README.md index 27726af8..1ed0109c 100644 --- a/README.md +++ b/README.md @@ -448,6 +448,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **26.09.24:** - Swap from firefox to chromium on Alpine images. * **23.05.24:** - Rebase Alpine to 3.20, document Nvidia support. * **22.04.24:** - Rebase Ubuntu to Noble. * **16.04.24:** - Add docs on PRoot Apps. diff --git a/readme-vars.yml b/readme-vars.yml index 5042446a..a800b260 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -200,6 +200,7 @@ app_setup_block: | # changelog changelogs: + - { date: "26.09.24:", desc: "Swap from firefox to chromium on Alpine images." } - { date: "23.05.24:", desc: "Rebase Alpine to 3.20, document Nvidia support." } - { date: "22.04.24:", desc: "Rebase Ubuntu to Noble." } - { date: "16.04.24:", desc: "Add docs on PRoot Apps." } diff --git a/root/usr/bin/chromium b/root/usr/bin/chromium new file mode 100755 index 00000000..f4adcab8 --- /dev/null +++ b/root/usr/bin/chromium @@ -0,0 +1,15 @@ +#! /bin/bash + +BIN=/usr/bin/chromium-browser + +# Cleanup +if ! pgrep chromium > /dev/null;then + rm -f $HOME/.config/chromium/Singleton* +fi + +# Run normally on privved containers or modified un non priv +if grep -q 'Seccomp:.0' /proc/1/status; then + ${BIN} --no-first-run --password-store=basic "$@" +else + ${BIN} --no-first-run --password-store=basic --no-sandbox --test-type "$@" +fi