Update to use selkies

Dockerfile

@@ -1,53 +1,73 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble AS build
+FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble AS build
 
 ARG DEBIAN_FRONTEND="noninteractive"
 
 ENV TITLE="XPipe Webtop"
-ARG XPIPE_VERSION
-ARG XPIPE_REPOSITORY
-ARG XPIPE_PACKAGE
-ARG TARGETPLATFORM
+ARG XPIPE_VERSION=20.2
+ARG XPIPE_REPOSITORY=xpipe-io/xpipe
+ARG XPIPE_PACKAGE=xpipe
+ARG TARGETPLATFORM=linux/amd64
 
 # prevent Ubuntu's firefox stub from being installed
-COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
+# COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
 
-RUN  echo "**** install base packages ****" && \
-  add-apt-repository -y ppa:mozillateam/ppa && \
+# title
+ENV TITLE="XPipe Webtop" \
+    NO_GAMEPAD=true
+
+RUN \
+  echo "**** add icon ****" && \
+  curl -o \
+    /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 ppa:xtradeb/apps && \
+  # add-apt-repository -y ppa:mozillateam/ppa && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
   apt-get install --no-install-recommends -y \
+  	chromium \
+    # firefox \
     dolphin \
-    firefox \
     gwenview \
     kde-config-gtk-style \
     kdialog \
+    kfind \
+    khotkeys \
     kio-extras \
+    knewstuff-dialog \
+    konsole \
+    ksystemstats \
     kubuntu-settings-desktop \
+    kubuntu-wallpapers \
+    kubuntu-web-shortcuts \
+    kwin-addons \
     kwin-x11 \
     kwrite \
-    wget \
-    git \
-    zip \
-    unzip \
-    kmod \
-    nano \
-    mousepad \
-    vim \
     plasma-desktop \
     plasma-workspace \
-    plymouth-theme-kubuntu-logo \
     qml-module-qt-labs-platform \
-    fonts-noto \
-    fonts-noto-cjk \
+    zip \
+    unzip \
+    git \
+    wget \
     systemsettings && \
- apt-get remove -y plasma-welcome && \
- apt-get autoclean && \
- rm -rf \
-   /config/.cache \
-   /config/.launchpadlib \
-   /var/lib/apt/lists/* \
-   /var/tmp/* \
-   /tmp/*
+  echo "**** application tweaks ****" && \
+  sed -i \
+    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
+    /usr/share/applications/chromium.desktop && \
+  echo "**** kde tweaks ****" && \
+  sed -i \
+    's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
+    /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
+  echo "**** cleanup ****" && \
+  apt-get autoclean && \
+  rm -rf \
+    /config/.cache \
+    /config/.launchpadlib \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /tmp/*
 
 RUN echo "**** nerdfonts ****" && \
   curl -LO "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/UbuntuMono.zip" && \
@@ -64,11 +84,18 @@ EXPOSE 3000
 EXPOSE 3001
 VOLUME /config
 
-RUN \
-  echo "**** add icon ****" && \
-  curl -L -o \
-    /kclient/public/icon.png \
-    "https://rawcdn.githack.com/xpipe-io/xpipe/a097ae7a41131fa358b5343345557ad00a45c309/dist/logo/logo.png"
+# RUN \
+  # echo "**** add icon ****" && \
+  # curl -L -o \
+    # /kclient/public/icon.png \
+    # "https://rawcdn.githack.com/xpipe-io/xpipe/a097ae7a41131fa358b5343345557ad00a45c309/dist/logo/logo.png"
+
+RUN echo "**** Wezterm ****" && \
+  curl -fsSL https://apt.fury.io/wez/gpg.key | sudo gpg --yes --dearmor -o /usr/share/keyrings/wezterm-fury.gpg && \
+  echo 'deb [signed-by=/usr/share/keyrings/wezterm-fury.gpg] https://apt.fury.io/wez/ * *' | sudo tee /etc/apt/sources.list.d/wezterm.list && \
+  chmod 644 /usr/share/keyrings/wezterm-fury.gpg && \
+  apt-get update && \
+  apt-get install --no-install-recommends -y wezterm
 
 RUN echo "**** VsCode **** ($TARGETPLATFORM)" && \
   if [ "$TARGETPLATFORM" = "linux/amd64" ]; then VSCODE_LINK="https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64"; else VSCODE_LINK="https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-arm64"; fi && \
@@ -152,13 +179,13 @@ RUN echo "**** XPipe **** ($TARGETPLATFORM)" && \
   apt-get install --no-install-recommends -y "./${XPIPE_ARTIFACT}" && \
   rm "./${XPIPE_ARTIFACT}"
 
-RUN mkdir -p "/etc/xdg/autostart/" && ln -s "/usr/share/applications/$XPIPE_PACKAGE.desktop" "/etc/xdg/autostart/$XPIPE_PACKAGE.desktop"
+# RUN mkdir -p "/etc/xdg/autostart/" && ln -s "/usr/share/applications/$XPIPE_PACKAGE.desktop" "/etc/xdg/autostart/$XPIPE_PACKAGE.desktop"
 
 RUN echo "**** kde tweaks ****" && \
   sed -i \
     "s/applications:org.kde.discover.desktop,/,/g" \
     /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
     sed -i \
-    "s#preferred://browser#applications:firefox.desktop,applications:org.kde.konsole.desktop,applications:code.desktop,applications:org.remmina.Remmina.desktop,applications:$XPIPE_PACKAGE.desktop#g" \
+    "s#preferred://browser#applications:chromium.desktop,applications:org.kde.konsole.desktop,applications:code.desktop,applications:org.remmina.Remmina.desktop,applications:$XPIPE_PACKAGE.desktop#g" \
     /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml