Merge branch 'selkies'

.github/workflows/docker-push.yml

@@ -1,76 +1,77 @@
-name: Docker Push
+name: Build Docker Image
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
 
 env:
   REGISTRY: git.nickbland.dev
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: ${{ gitea.repository }}
 
 jobs:
-  build-and-push-image:
+  build-and-push:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set variables
+      - name: Set up Docker Buildx
-        run: |
+        uses: docker/setup-buildx-action@v3
-          if echo "${{ github.event.head_commit.message }}" | grep -q '\[release\]'; then
-            XPIPE_VERSION=$(cat version-main)
-            XPIPE_REPOSITORY="xpipe-io/xpipe"
-            XPIPE_PACKAGE="xpipe"
-            XPIPE_TAG="main"
-          else
-            XPIPE_VERSION=$(cat version-ptb)
-            XPIPE_REPOSITORY="xpipe-io/xpipe-ptb"
-            XPIPE_PACKAGE="xpipe-ptb"
-            XPIPE_TAG="ptb"
-          fi
-
-          echo "XPIPE_VERSION=$XPIPE_VERSION" >> $GITHUB_ENV
-          echo "XPIPE_REPOSITORY=$XPIPE_REPOSITORY" >> $GITHUB_ENV
-          echo "XPIPE_PACKAGE=$XPIPE_PACKAGE" >> $GITHUB_ENV
-          echo "XPIPE_TAG=$XPIPE_TAG" >> $GITHUB_ENV
 
       - name: Log in to Gitea Container Registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          username: ${{ gitea.actor }}
-          password: ${{ secrets.CONTAINER_TOKEN }}
+          password: ${{ secrets.GITEA_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=${{ contains(github.event.head_commit.message, '[release]') }}
           tags: |
-            type=raw,value=${{ env.XPIPE_TAG }}
+            type=ref,event=branch
-          labels: |
+            type=ref,event=pr
-            org.opencontainers.image.vendor=xpipe.io
+            type=semver,pattern={{version}}
-            org.opencontainers.image.authors=xpipe.io
+            type=semver,pattern={{major}}.{{minor}}
-            org.opencontainers.image.documentation=https://github.com/xpipe-io/xpipe-webtop
+            type=semver,pattern={{major}}
+            type=sha,prefix={{branch}}-
+            type=raw,value=latest,enable={{is_default_branch}}
 
-      - name: Set up QEMU
+      - name: Set build arguments
-        uses: docker/setup-qemu-action@v3
+        id: build_args
-
+        run: |
-      - name: Set up Buildx
+          echo "XPIPE_VERSION=20.3" >> $GITHUB_OUTPUT
-        uses: docker/setup-buildx-action@v3
+          echo "XPIPE_REPOSITORY=xpipe-io/xpipe" >> $GITHUB_OUTPUT
+          echo "XPIPE_PACKAGE=io.xpipe.xpipe_stage" >> $GITHUB_OUTPUT
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            XPIPE_VERSION=${{ env.XPIPE_VERSION }}
+            XPIPE_VERSION=${{ steps.build_args.outputs.XPIPE_VERSION }}
-            XPIPE_REPOSITORY=${{ env.XPIPE_REPOSITORY }}
+            XPIPE_REPOSITORY=${{ steps.build_args.outputs.XPIPE_REPOSITORY }}
-            XPIPE_PACKAGE=${{ env.XPIPE_PACKAGE }}
+            XPIPE_PACKAGE=${{ steps.build_args.outputs.XPIPE_PACKAGE }}
-          platforms: linux/amd64
+            TARGETPLATFORM=linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Image digest
+        run: echo ${{ steps.build.outputs.digest }}

Dockerfile

@@ -1,34 +1,27 @@
+FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
+
 ARG DEBIAN_FRONTEND="noninteractive"
-ARG XPIPE_VERSION=20.2
-ARG XPIPE_REPOSITORY=xpipe-io/xpipe
-ARG XPIPE_PACKAGE=xpipe
 
-# FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble AS build
+# Title and Selkies specific envs
-FROM lscr.io/linuxserver/webtop:ubuntu-kde AS build
-
-ENV TITLE="XPipe Webtop"
-
-# prevent Ubuntu's firefox stub from being installed
-# COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
-
-# title
 ENV TITLE="XPipe Webtop" \
     NO_GAMEPAD=true
 
-RUN \
+ARG XPIPE_VERSION
-  echo "**** add icon ****" && \
+ARG XPIPE_REPOSITORY
-  curl -o \
+ARG XPIPE_PACKAGE
-    /usr/share/selkies/www/icon.png \
+ARG TARGETPLATFORM
-    https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
+
-  echo "**** install packages ****" && \
+# prevent Ubuntu's firefox stub from being installed
-  add-apt-repository ppa:xtradeb/apps && \
+COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
-  # add-apt-repository -y ppa:mozillateam/ppa && \
+
+RUN  echo "**** install base packages ****" && \
+  add-apt-repository -y ppa:mozillateam/ppa && \
+  add-apt-repository -y ppa:xtradeb/apps && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
   apt-get install --no-install-recommends -y \
-  	chromium \
-    # firefox \
     dolphin \
+    firefox \
     gwenview \
     kde-config-gtk-style \
     kdialog \
@@ -36,7 +29,6 @@ RUN \
     khotkeys \
     kio-extras \
     knewstuff-dialog \
-    konsole \
     ksystemstats \
     kubuntu-settings-desktop \
     kubuntu-wallpapers \
@@ -44,23 +36,22 @@ RUN \
     kwin-addons \
     kwin-x11 \
     kwrite \
-    plasma-desktop \
+    wget \
-    plasma-workspace \
+    git \
-    qml-module-qt-labs-platform \
     zip \
     unzip \
-    git \
+    kmod \
-    wget \
+    nano \
+    mousepad \
+    vim \
+    plasma-desktop \
+    plasma-workspace \
+    plymouth-theme-kubuntu-logo \
+    qml-module-qt-labs-platform \
+    fonts-noto \
+    fonts-noto-cjk \
     systemsettings && \
-  echo "**** application tweaks ****" && \
+  apt-get remove -y plasma-welcome && \
-  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 \
@@ -81,29 +72,21 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3000
-EXPOSE 3001
 VOLUME /config
 
-# RUN \
+RUN \
-  # echo "**** add icon ****" && \
+  echo "**** add icon ****" && \
-  # curl -L -o \
+  curl -L -o \
-    # /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
-    # "https://rawcdn.githack.com/xpipe-io/xpipe/a097ae7a41131fa358b5343345557ad00a45c309/dist/logo/logo.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 | 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/ * *' | 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)" && \
-    wget -O vscode.deb "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64" && \
+  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 && \
-    apt-get update && \
+  wget -O vscode.deb "${VSCODE_LINK}" && \
-    apt-get install --no-install-recommends -y ./vscode.deb && \
+  DEBIAN_FRONTEND=noninteractive \
-    rm vscode.deb && \
+  apt-get update && \
-    apt-get clean && \
+  apt-get install --no-install-recommends -y "./vscode.deb" && \
-    rm -rf /var/lib/apt/lists/*
+  rm "./vscode.deb"
 
 RUN  echo "**** install tool packages ****" && \
   DEBIAN_FRONTEND=noninteractive \
@@ -123,7 +106,7 @@ RUN  echo "**** install tool packages ****" && \
     tmux \
     screen \
     remmina-plugin-rdp && \
- apt-get autoclean
+  apt-get autoclean
 
 RUN echo "**** tailscale ****" && curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/noble.noarmor.gpg | tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null && \
     curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/noble.tailscale-keyring.list | tee /etc/apt/sources.list.d/tailscale.list && \
@@ -136,7 +119,7 @@ RUN echo "**** netbird ****" && \
     curl -sSL https://pkgs.netbird.io/debian/public.key | gpg --dearmor --output /usr/share/keyrings/netbird-archive-keyring.gpg && \
     echo 'deb [signed-by=/usr/share/keyrings/netbird-archive-keyring.gpg] https://pkgs.netbird.io/debian stable main' | tee /etc/apt/sources.list.d/netbird.list && \
     apt-get update && \
-    pt-get install netbird
+    apt-get install netbird
 
 RUN echo "**** teleport ****" && curl https://apt.releases.teleport.dev/gpg -o /etc/apt/keyrings/teleport-archive-keyring.asc && \
     . /etc/os-release && \
@@ -145,7 +128,8 @@ RUN echo "**** teleport ****" && curl https://apt.releases.teleport.dev/gpg -o /
     DEBIAN_FRONTEND=noninteractive apt-get -y install teleport
 
 RUN echo "**** kubectl **** ($TARGETPLATFORM)" && \
-  curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
+  if [ "$TARGETPLATFORM" = "linux/amd64" ]; then KUBECTL_LINK="https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"; else KUBECTL_LINK="https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/arm64/kubectl"; fi && \
+  curl -LO "${KUBECTL_LINK}" && \
   install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
   rm kubectl
 
@@ -155,12 +139,14 @@ RUN echo "**** aws ****" && curl "https://awscli.amazonaws.com/awscli-exe-linux-
   rm -rf "/tmp/aws" "/tmp/awscliv2.zip"
 
 RUN echo "**** aws ssm **** ($TARGETPLATFORM)" && \
-  curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" -o "/tmp/session-manager-plugin.deb" && \
+  if [ "$TARGETPLATFORM" = "linux/amd64" ]; then SSM_LINK="https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb"; else SSM_LINK="https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_arm64/session-manager-plugin.deb"; fi && \
+  curl "${SSM_LINK}" -o "/tmp/session-manager-plugin.deb" && \
   dpkg -i "/tmp/session-manager-plugin.deb" && \
   rm -rf "/tmp/aws" "/tmp/session-manager-plugin.deb"
 
 RUN echo "**** zellij **** ($TARGETPLATFORM)" && \
-  curl -LO "https://github.com/zellij-org/zellij/releases/latest/download/zellij-x86_64-unknown-linux-musl.tar.gz" && \
+  if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ZELLIJ_LINK="https://github.com/zellij-org/zellij/releases/latest/download/zellij-x86_64-unknown-linux-musl.tar.gz"; else ZELLIJ_LINK="https://github.com/zellij-org/zellij/releases/latest/download/zellij-aarch64-unknown-linux-musl.tar.gz"; fi && \
+  curl -LO "${ZELLIJ_LINK}" && \
   tar -xvf zellij*.tar.gz && \
   install -o root -g root -m 0755 zellij /usr/local/bin/zellij && \
   rm zellij && \
@@ -169,19 +155,19 @@ RUN echo "**** zellij **** ($TARGETPLATFORM)" && \
 RUN echo "**** dolphin tweaks ****" && printf "x-scheme-handler/file=org.kde.dolphin.desktop\n" >> /usr/share/applications/kde-mimeapps.list
 
 RUN echo "**** XPipe **** ($TARGETPLATFORM)" && \
+  if [ "$TARGETPLATFORM" = "linux/amd64" ]; then XPIPE_ARTIFACT="xpipe-installer-linux-x86_64.deb"; else XPIPE_ARTIFACT="xpipe-installer-linux-arm64.deb"; fi && \
   wget "https://github.com/$XPIPE_REPOSITORY/releases/download/$XPIPE_VERSION/${XPIPE_ARTIFACT}" && \
   DEBIAN_FRONTEND=noninteractive \
   apt-get update && \
-  apt-get install --no-install-recommends -y ".xpipe-installer-linux-x86_64.deb" && \
+  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:chromium.desktop,applications:org.kde.konsole.desktop,applications:code.desktop,applications:org.remmina.Remmina.desktop,applications:$XPIPE_PACKAGE.desktop#g" \
+    "s#preferred://browser#applications:firefox.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
+    /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml
-