rebase ubuntu-mate to selkies (#311)

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -9,21 +9,23 @@ LABEL maintainer="thelamer"
 # title
 ENV TITLE="Ubuntu MATE"
 
-# prevent Ubuntu's firefox stub from being installed
-COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
-
 RUN \
   echo "**** add icon ****" && \
   curl -o \
-    /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
-  add-apt-repository -y ppa:mozillateam/ppa && \
+  apt-key adv \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
+    --recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \
+  echo \
+    "deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \
+    /etc/apt/sources.list.d/xtradeb.list && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
   apt-get install --no-install-recommends -y \
     ayatana-indicator-application \
-    firefox \
+    chromium \
     mate-applets \
     mate-applet-brisk-menu \
     mate-terminal \
@@ -33,6 +35,9 @@ RUN \
     ubuntu-mate-desktop \
     ubuntu-mate-icon-themes && \
   echo "**** mate tweaks ****" && \
+  sed -i \
+    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
+    /usr/share/applications/chromium.desktop && \
   rm -f \
     /etc/xdg/autostart/mate-power-manager.desktop \
     /etc/xdg/autostart/mate-screensaver.desktop && \
@@ -41,6 +46,7 @@ RUN \
   rm -rf \
     /config/.cache \
     /config/.launchpadlib \
+    /usr/share/gvfs/remote-volume-monitors/* \
     /var/lib/apt/lists/* \
     /var/tmp/* \
     /tmp/*

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -9,21 +9,23 @@ LABEL maintainer="thelamer"
 # title
 ENV TITLE="Ubuntu MATE"
 
-# prevent Ubuntu's firefox stub from being installed
-COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
-
 RUN \
   echo "**** add icon ****" && \
   curl -o \
-    /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
-  add-apt-repository -y ppa:mozillateam/ppa && \
+  apt-key adv \
+    --keyserver hkp://keyserver.ubuntu.com:80 \
+    --recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \
+  echo \
+    "deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \
+    /etc/apt/sources.list.d/xtradeb.list && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
   apt-get install --no-install-recommends -y \
     ayatana-indicator-application \
-    firefox \
+    chromium \
     mate-applets \
     mate-applet-brisk-menu \
     mate-terminal \
@@ -33,6 +35,9 @@ RUN \
     ubuntu-mate-desktop \
     ubuntu-mate-icon-themes && \
   echo "**** mate tweaks ****" && \
+  sed -i \
+    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
+    /usr/share/applications/chromium.desktop && \
   rm -f \
     /etc/xdg/autostart/mate-power-manager.desktop \
     /etc/xdg/autostart/mate-screensaver.desktop && \
@@ -41,6 +46,7 @@ RUN \
   rm -rf \
     /config/.cache \
     /config/.launchpadlib \
+    /usr/share/gvfs/remote-volume-monitors/* \
     /var/lib/apt/lists/* \
     /var/tmp/* \
     /tmp/*

Jenkinsfile

@@ -30,8 +30,8 @@ pipeline {
     MULTIARCH='true'
     CI='true'
     CI_WEB='true'
-    CI_PORT='3000'
-    CI_SSL='false'
+    CI_PORT='3001'
+    CI_SSL='true'
     CI_DELAY='120'
     CI_DOCKERENV='TZ=US/Pacific'
     CI_AUTH='user:password'

jenkins-vars.yml

@@ -19,8 +19,8 @@ repo_vars:
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='true'
-  - CI_PORT='3000'
-  - CI_SSL='false'
+  - CI_PORT='3001'
+  - CI_SSL='true'
   - CI_DELAY='120'
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'

root/etc/apt/preferences.d/firefox-no-snap

@@ -1,3 +0,0 @@
-Package: firefox*
-Pin: release o=Ubuntu*
-Pin-Priority: -1

root/usr/local/bin/wrapped-chromium

@@ -0,0 +1,15 @@
+#! /bin/bash
+
+BIN=/usr/bin/chromium
+
+# 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