From e0a487869f259e65409e7f8221fca8406cff8dd9 Mon Sep 17 00:00:00 2001
From: Ryan Kuba <ryankuba@gmail.com>
Date: Fri, 29 Dec 2023 15:55:55 -0800
Subject: [PATCH] rebase master to 3.19 swap to firefox (#193)

---
 Dockerfile                          |  9 ++-------
 Dockerfile.aarch64                  |  9 ++-------
 README.md                           |  1 +
 readme-vars.yml                     |  1 +
 root/usr/bin/exo-open               |  7 -------
 root/usr/local/bin/wrapped-chromium | 10 ----------
 6 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100755 root/usr/bin/exo-open
 delete mode 100755 root/usr/local/bin/wrapped-chromium

diff --git a/Dockerfile b/Dockerfile
index 7fea8966..a8eded2e 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,21 +11,16 @@ LABEL maintainer="thelamer"
 RUN \
   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 \
     util-linux-misc \
     xfce4 \
     xfce4-terminal && \
-  echo "**** application tweaks ****" && \
-  sed -i \
-    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
-    /usr/share/applications/chromium.desktop && \
-  mv /usr/bin/exo-open /usr/bin/exo-open-real && \
   echo "**** cleanup ****" && \
   rm -f \
     /etc/xdg/autostart/xfce4-power-manager.desktop \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 400d05c6..8a52f5e8 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,21 +11,16 @@ LABEL maintainer="thelamer"
 RUN \
   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 \
     util-linux-misc \
     xfce4 \
     xfce4-terminal && \
-  echo "**** application tweaks ****" && \
-  sed -i \
-    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
-    /usr/share/applications/chromium.desktop && \
-  mv /usr/bin/exo-open /usr/bin/exo-open-real && \
   echo "**** cleanup ****" && \
   rm -f \
     /etc/xdg/autostart/xfce4-power-manager.desktop \
diff --git a/README.md b/README.md
index 77791b64..c549b6d3 100644
--- a/README.md
+++ b/README.md
@@ -399,6 +399,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.12.23:** - Rebase Alpine to 3.19 and swap back to Firefox.
 * **07.11.23:** - Rebase Fedora to 39.
 * **14.06.23:** - Rebase to Debian Bookworm.
 * **13.05.23:** - Rebase to Alpine 3.18 and Fedora 38.
diff --git a/readme-vars.yml b/readme-vars.yml
index 59ed6cf7..f38759e8 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -135,6 +135,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "29.12.23:", desc: "Rebase Alpine to 3.19 and swap back to Firefox." }
   - { date: "07.11.23:", desc: "Rebase Fedora to 39." }
   - { date: "14.06.23:", desc: "Rebase to Debian Bookworm." }
   - { date: "13.05.23:", desc: "Rebase to Alpine 3.18 and Fedora 38." }
diff --git a/root/usr/bin/exo-open b/root/usr/bin/exo-open
deleted file mode 100755
index 87d07324..00000000
--- a/root/usr/bin/exo-open
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/bash
-
-if [ "${2}" == "WebBrowser" ]; then
-  /usr/bin/xdg-open /usr/share/applications/chromium.desktop
-else 
-  /usr/bin/exo-open-real "$@"
-fi
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