From ede34cf003379b5d7d935bc3ee226f5fe122f3ce Mon Sep 17 00:00:00 2001
From: Christopher Schnick <crschnick@xpipe.io>
Date: Wed, 24 Dec 2025 19:37:47 +0100
Subject: [PATCH] Add netbird and aws [stage]

---
 .gitignore  |  3 ++-
 Dockerfile  | 34 ++++++++++++++++++++++++++--------
 version-ptb |  2 +-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 723ef36..5a5900c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.idea
\ No newline at end of file
+.idea
+test/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7608dde..2aeb658 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -103,6 +103,14 @@ RUN echo "**** tailscale ****" && curl -fsSL https://pkgs.tailscale.com/stable/u
     sudo apt-get update && \
     DEBIAN_FRONTEND=noninteractive sudo apt-get install -y tailscale
 
+RUN echo "**** netbird ****" && \
+    sudo apt-get update && \
+    sudo apt-get install ca-certificates curl gnupg -y && \
+    curl -sSL https://pkgs.netbird.io/debian/public.key | sudo 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' | sudo tee /etc/apt/sources.list.d/netbird.list && \
+    sudo apt-get update && \
+    sudo apt-get install netbird
+
 RUN echo "**** teleport ****" && sudo curl https://apt.releases.teleport.dev/gpg -o /etc/apt/keyrings/teleport-archive-keyring.asc && \
     . /etc/os-release && \
     echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/v17" | sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null && \
@@ -115,13 +123,14 @@ RUN echo "**** kubectl **** ($TARGETPLATFORM)" && \
   sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
   rm kubectl
 
-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_ARTIFACT}" && \
-  rm "./${XPIPE_ARTIFACT}"
+RUN echo "**** aws ****" && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip" && \
+  unzip "/tmp/awscliv2.zip" -d "/tmp" && \
+  sudo "/tmp/aws/install" && \
+  rm -rf "/tmp/aws" "/tmp/awscliv2.zip"
+
+RUN echo "**** aws ssm ****" && curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" -o "/tmp/session-manager-plugin.deb" && \
+  sudo dpkg -i "/tmp/session-manager-plugin.deb" && \
+  rm -rf "/tmp/aws" "/tmp/session-manager-plugin.deb"
 
 RUN echo "**** zellij **** ($TARGETPLATFORM)" && \
   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 && \
@@ -131,6 +140,16 @@ RUN echo "**** zellij **** ($TARGETPLATFORM)" && \
   rm zellij && \
   rm zellij*.tar.gz
 
+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_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 echo "**** kde tweaks ****" && \
@@ -141,4 +160,3 @@ RUN echo "**** kde tweaks ****" && \
     "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
 
-RUN echo "**** dolphin tweaks ****" && printf "x-scheme-handler/file=org.kde.dolphin.desktop\n" >> /usr/share/applications/kde-mimeapps.list
diff --git a/version-ptb b/version-ptb
index 7b60477..3e682c5 100644
--- a/version-ptb
+++ b/version-ptb
@@ -1 +1 @@
-18.2-3
\ No newline at end of file
+20.0-12
\ No newline at end of file