From 417be1fdce724f04029c254dfd77c5fc0b53cdd9 Mon Sep 17 00:00:00 2001
From: HelmDesign <helmpupper@proton.me>
Date: Mon, 20 Jul 2026 17:30:26 +0000
Subject: [PATCH] Add proot-apps installation to Dockerfiles and create
 compose.yml for webtop service

---
 .gitignore         |  2 ++
 Dockerfile         |  9 +++++++++
 Dockerfile.aarch64 |  9 +++++++++
 compose.yml        | 18 ++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 compose.yml

diff --git a/.gitignore b/.gitignore
index df432a482..7d6d214ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 .jenkins-external
+data
+rustdesk
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index dc8e360c8..99627737b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,6 +40,15 @@ RUN \
     /usr/bin/chromium-browser && \
   rm -f \
     /etc/xdg/autostart/xscreensaver.desktop && \
+  echo "**** install proot-apps ****" && \
+  rm -f \
+    "$HOME/.local/bin/ncat" \
+    "$HOME/.local/bin/proot-apps" \
+    "$HOME/.local/bin/proot" \
+    "$HOME/.local/bin/jq" && \
+  mkdir -p "$HOME/.local/bin" && \
+  curl -L "https://github.com/linuxserver/proot-apps/releases/download/$(curl -sX GET "https://api.github.com/repos/linuxserver/proot-apps/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[\"\"]')/proot-apps-$(uname -m).tar.gz" | tar -xzf - -C "$HOME/.local/bin/" && \
+  export PATH="$HOME/.local/bin:$PATH" && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 6143a033e..29eea6ac7 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -40,6 +40,15 @@ RUN \
     /usr/bin/chromium-browser && \
   rm -f \
     /etc/xdg/autostart/xscreensaver.desktop && \
+  echo "**** install proot-apps ****" && \
+  rm -f \
+    "$HOME/.local/bin/ncat" \
+    "$HOME/.local/bin/proot-apps" \
+    "$HOME/.local/bin/proot" \
+    "$HOME/.local/bin/jq" && \
+  mkdir -p "$HOME/.local/bin" && \
+  curl -L "https://github.com/linuxserver/proot-apps/releases/download/$(curl -sX GET "https://api.github.com/repos/linuxserver/proot-apps/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[\"\"]')/proot-apps-$(uname -m).tar.gz" | tar -xzf - -C "$HOME/.local/bin/" && \
+  export PATH="$HOME/.local/bin:$PATH" && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
diff --git a/compose.yml b/compose.yml
new file mode 100644
index 000000000..2eb56692b
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,18 @@
+---
+services:
+  webtop:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: webtop
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - ./data:/config
+    ports:
+      - 3000:3000
+      - 3001:3001
+    shm_size: "1gb"
+    restart: unless-stopped
\ No newline at end of file