From d9274e9ed3009e69e8969b4f328a42e8ba7012f5 Mon Sep 17 00:00:00 2001
From: LinuxSquare <linuxscripting.sh@gmail.com>
Date: Sat, 16 Nov 2024 12:03:16 +0100
Subject: [PATCH] Prepare for rootful docker

---
 APKBUILD                                 |  3 +--
 pterodactyl-panel-compose.initd.in       |  1 -
 pterodactyl-panel-compose.post-deinstall |  3 ---
 pterodactyl-panel-compose.post-install   |  6 ------
 pterodactyl-panel.sh.in                  | 12 ++++++------
 5 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 pterodactyl-panel-compose.post-deinstall
 delete mode 100644 pterodactyl-panel-compose.post-install

diff --git a/APKBUILD b/APKBUILD
index 13a3f32..7150b35 100644
--- a/APKBUILD
+++ b/APKBUILD
@@ -8,12 +8,11 @@ url="https://pterodactyl.io/"
 license="MIT"
 optdepends="podman docker" # Install either podman or docker
 makedepends="go"
-install="$pkgname.post-install $pkgname.post-deinstall"
 options="!check"
 
 package() {
   DESTDIR="$pkgdir" make install
   local compose_path=$(find $pkgdir -name pterodactyl-panel.sh -exec dirname {} \; | sed "s|$pkgdir||")
   sed -i "s|%VERSION%|$pkgver|" "${pkgdir}${compose_path}/pterodactyl-panel.sh"
-  chown -R 1337:1337 "${pkgdir}${compose_path}"
+  chown -R root:root "${pkgdir}${compose_path}"
 }
diff --git a/pterodactyl-panel-compose.initd.in b/pterodactyl-panel-compose.initd.in
index 23d2bf9..4f5909d 100644
--- a/pterodactyl-panel-compose.initd.in
+++ b/pterodactyl-panel-compose.initd.in
@@ -6,7 +6,6 @@ supervisor="supervise-daemon"
 
 command="/usr/share/pterodactyl-panel/pterodactyl-panel.sh"
 command_args="start $(ip a | grep "state UP" -A2 | grep inet | awk '{$1=$1};1 {split($2,a,"/"); print a[1]}')"
-command_user="pterodactyl"
 
 depend() {
   need net
diff --git a/pterodactyl-panel-compose.post-deinstall b/pterodactyl-panel-compose.post-deinstall
deleted file mode 100644
index 114a4ab..0000000
--- a/pterodactyl-panel-compose.post-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-deluser pterodactyl 2>/dev/null
diff --git a/pterodactyl-panel-compose.post-install b/pterodactyl-panel-compose.post-install
deleted file mode 100644
index b3deae4..0000000
--- a/pterodactyl-panel-compose.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S -g 1337 pterodactyl 2>/dev/null
-adduser -S -h /home/pterodactyl -D -u 1337 -s /bin/bash -G pterodactyl pterodactyl 2>/dev/null
-
-exit 0
diff --git a/pterodactyl-panel.sh.in b/pterodactyl-panel.sh.in
index 45535a6..bb65c7d 100755
--- a/pterodactyl-panel.sh.in
+++ b/pterodactyl-panel.sh.in
@@ -2,14 +2,14 @@
 
 start() {
   mkdir database var nginx certs logs || true
-  podman run --rm --network=host -d --name "pterodactyl-db" -v ./database:/var/lib/mysql -e MYSQL_DATABASE="panel" -e MYSQL_USER="pterodactyl" -e MYSQL_PASSWORD="%MYSQL_PASSWORD%" -e MYSQL_ROOT_PASSWORD="%MYSQL_ROOT_PASSWORD%" --userns=keep-id:uid=999,gid=999 docker.io/mariadb:10.5 --default-authentication-plugin=mysql_native_password
-  podman run --rm --network=host -d --name "pterodactyl-cache" docker.io/redis:alpine
-  podman run --rm --network=host -d --name "pterodactyl-panel" -v ./var:/app/var -v ./nginx:/etc/nginx/http.d -v ./certs:/etc/letsencrypt -v ./logs:/app/storage/logs -e DB_PASSWORD="%MYSQL_PASSWORD%" -e APP_ENV="production" -e APP_ENVIRONMENT_ONLY="false" -e CACHE_DRIVER="redis" -e SESSION_DRIVER="redis" -e QUEUE_DRIVER="redis" -e REDIS_HOST="$1" -e DB_HOST="$1" -e DB_PORT="3306" -e TRUSTED_PROXIES="*" -e APP_TIMEZONE="%APP_TIMEZONE%" -e APP_SERVICE_AUTHOR="mail@example.com" ghcr.io/pterodactyl/panel:v%VERSION%
+  docker run --rm --network=host -d --name "pterodactyl-db" -v ./database:/var/lib/mysql -e MYSQL_DATABASE="panel" -e MYSQL_USER="pterodactyl" -e MYSQL_PASSWORD="%MYSQL_PASSWORD%" -e MYSQL_ROOT_PASSWORD="%MYSQL_ROOT_PASSWORD%" docker.io/mariadb:10.5 --default-authentication-plugin=mysql_native_password
+  docker run --rm --network=host -d --name "pterodactyl-cache" docker.io/redis:alpine
+  docker run --rm --network=host -d --name "pterodactyl-panel" -v ./var:/app/var -v ./nginx:/etc/nginx/http.d -v ./certs:/etc/letsencrypt -v ./logs:/app/storage/logs -e DB_PASSWORD="%MYSQL_PASSWORD%" -e APP_ENV="production" -e APP_ENVIRONMENT_ONLY="false" -e CACHE_DRIVER="redis" -e SESSION_DRIVER="redis" -e QUEUE_DRIVER="redis" -e REDIS_HOST="$1" -e DB_HOST="$1" -e DB_PORT="3306" -e TRUSTED_PROXIES="*" -e APP_TIMEZONE="%APP_TIMEZONE%" -e APP_SERVICE_AUTHOR="mail@example.com" ghcr.io/pterodactyl/panel:v%VERSION%
 }
 
 stop() {
-  podman container stop pterodactyl-db
-  podman container stop pterodactyl-cache
-  podman container stop pterodactyl-panel
+  docker container stop pterodactyl-db
+  docker container stop pterodactyl-cache
+  docker container stop pterodactyl-panel
 }
 $1 $2