From efdf87ed8af1f4cf685d0d0c28748cddae7fd758 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Thu, 18 May 2023 19:45:44 +0100
Subject: [PATCH] Update packages and cleanup

---
 Dockerfile                    | 22 +++++++++++++++++++---
 Dockerfile.aarch64            | 22 +++++++++++++++++++---
 root/usr/bin/chromium-browser | 10 ++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100755 root/usr/bin/chromium-browser

diff --git a/Dockerfile b/Dockerfile
index 10be27b3..129487be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,9 +13,25 @@ RUN \
   apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
     icewm && \
   apk add --no-cache \
-    firefox \
-    font-noto \
-    xterm && \
+    chromium \
+    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 && \
+  rm /usr/bin/xterm && \
+  ln -s \
+    /usr/bin/st \
+    /usr/bin/xterm && \
+  echo "**** theme ****" && \
+  rm -Rf /usr/share/icewm/themes/default && \
+  curl -s \
+    http://ryankuba.com/ice.tar.gz \
+    | tar zxf - -C /usr/share/icewm/themes/ && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7463fee2..3ee7ba05 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -13,9 +13,25 @@ RUN \
   apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
     icewm && \
   apk add --no-cache \
-    firefox \
-    font-noto \
-    xterm && \
+    chromium \
+    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 && \
+  rm /usr/bin/xterm && \
+  ln -s \
+    /usr/bin/st \
+    /usr/bin/xterm && \
+  echo "**** theme ****" && \
+  rm -Rf /usr/share/icewm/themes/default && \
+  curl -s \
+    http://ryankuba.com/ice.tar.gz \
+    | tar zxf - -C /usr/share/icewm/themes/ && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/root/usr/bin/chromium-browser b/root/usr/bin/chromium-browser
new file mode 100755
index 00000000..4c9655a0
--- /dev/null
+++ b/root/usr/bin/chromium-browser
@@ -0,0 +1,10 @@
+#!/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