From 3c29d6d46055950df6ae31e90e50e74c6605915e Mon Sep 17 00:00:00 2001
From: Mindfang <mindfang@taco.quest>
Date: Tue, 23 Jan 2024 13:11:56 -0600
Subject: [PATCH] Rewrite to not need bash

---
 Dockerfile                              |  6 +++---
 root/etc/s6-overlay/s6-rc.d/crond/run   |  2 +-
 root/etc/s6-overlay/s6-rc.d/nginx/run   |  2 +-
 root/etc/s6-overlay/s6-rc.d/php-fpm/run |  2 +-
 root/etc/s6-overlay/s6-rc.d/pteroq/run  |  2 +-
 root/etc/s6-overlay/scripts/initializer | 16 ++++++++--------
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d83516b..71fd737 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,6 @@ ENV PHP_VER="php81" \
     NODE_OPTIONS=--openssl-legacy-provider
 
 RUN apk --no-cache add \
-        bash \
         curl \
         nginx \
         ${PHP_VER} \
@@ -31,6 +30,7 @@ RUN apk --no-cache add \
         ${PHP_VER}-xmlwriter \
         ${PHP_VER}-zip \
         ${PHP_VER}-zlib && \
+    rm -rf /var/www/localhost && \
     mkdir -p \
         /var/www/pterodactyl \
         /run/nginx \
@@ -48,7 +48,7 @@ ADD https://github.com/pterodactyl/panel/releases/latest/download/panel.tar.gz p
 
 # Install dependencies, perform Panel installation process
 RUN apk --no-cache add yarn && \
-    tar -xf panel.tar.gz && \
+    tar -xzvf panel.tar.gz && \
     rm panel.tar.gz && \
     chmod -R 755 storage/* bootstrap/cache && \
     find storage -type d > .storage.tmpl && \
@@ -77,7 +77,7 @@ ADD https://github.com/just-containers/s6-overlay/releases/latest/download/s6-ov
 ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /usr/local/bin/wait-for-it
 
 # Download common tools
-ADD https://gitea.taco.quest/Mindfang/ProjectTools/raw/branch/main/DockerUtilities/ContainerTools /usr/bin/ContainerTools
+ADD https://gitea.taco.quest/Mindfang/ProjectTools/raw/branch/main/DockerUtilities/sh/ContainerTools /usr/bin/ContainerTools
 
 # Install S6-Overlay and Wait-For-It
 RUN chmod u+x /usr/local/bin/wait-for-it /etc/s6-overlay/scripts/initializer && \
diff --git a/root/etc/s6-overlay/s6-rc.d/crond/run b/root/etc/s6-overlay/s6-rc.d/crond/run
index 1396db5..e188854 100644
--- a/root/etc/s6-overlay/s6-rc.d/crond/run
+++ b/root/etc/s6-overlay/s6-rc.d/crond/run
@@ -1,3 +1,3 @@
-#!/command/with-contenv bash
+#!/command/with-contenv sh
 
 /usr/sbin/crond -fL /dev/null
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/nginx/run b/root/etc/s6-overlay/s6-rc.d/nginx/run
index 34cb95c..ac8ed5a 100644
--- a/root/etc/s6-overlay/s6-rc.d/nginx/run
+++ b/root/etc/s6-overlay/s6-rc.d/nginx/run
@@ -1,3 +1,3 @@
-#!/command/with-contenv bash
+#!/command/with-contenv sh
 
 /usr/sbin/nginx -g "daemon off;"
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/php-fpm/run b/root/etc/s6-overlay/s6-rc.d/php-fpm/run
index 81c05e8..6eccf6f 100644
--- a/root/etc/s6-overlay/s6-rc.d/php-fpm/run
+++ b/root/etc/s6-overlay/s6-rc.d/php-fpm/run
@@ -1,3 +1,3 @@
-#!/command/with-contenv bash
+#!/command/with-contenv sh
 
 /usr/sbin/php-fpm -Fc /etc/php
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/pteroq/run b/root/etc/s6-overlay/s6-rc.d/pteroq/run
index 86617dc..54d3ab0 100644
--- a/root/etc/s6-overlay/s6-rc.d/pteroq/run
+++ b/root/etc/s6-overlay/s6-rc.d/pteroq/run
@@ -1,4 +1,4 @@
-#!/command/with-contenv bash
+#!/command/with-contenv sh
 
 s6-setuidgid nginx
 /usr/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
\ No newline at end of file
diff --git a/root/etc/s6-overlay/scripts/initializer b/root/etc/s6-overlay/scripts/initializer
index 56a4a09..a86ecb8 100644
--- a/root/etc/s6-overlay/scripts/initializer
+++ b/root/etc/s6-overlay/scripts/initializer
@@ -1,14 +1,14 @@
-#!/command/with-contenv bash
+#!/command/with-contenv sh
+
 source ContainerTools
-SNAME=${BASH_SOURCE##*/}
+SNAME=${0##*/}
 WORKDIR="/var/www/pterodactyl"
 
-#
 # If DBHOST value is present, pause boot until target container is up.
 if [ -n "$DBHOST" ]; then
     log "Waiting for SQL at $DBHOST:${DBPORT:=3306}"
-    if  wait-for-it $DBHOST:$DBPORT -q -t ${TESTTIME:=30}; then
-        log "SQL found, continuing"        
+    if wait-for-it $DBHOST:$DBPORT -q -t ${TESTTIME:=30}; then
+        log "SQL found, continuing"
     else
         log "SQL could not be reached!  Exiting..."
         exit 1
@@ -18,8 +18,8 @@ fi
 # If REDISHOST value is present, pause boot until target container is up.
 if [ -n "$REDISHOST" ]; then
     log "Waiting for Redis at $REDISHOST:${REDISPORT:=6379}"
-    if  wait-for-it $REDISHOST:$REDISPORT -q -t ${TESTTIME:=30}; then
-        log "Redis found, continuing"        
+    if wait-for-it $REDISHOST:$REDISPORT -q -t ${TESTTIME:=30}; then
+        log "Redis found, continuing"
     else
         log "Redis could not be reached!  Exiting..."
         exit 1
@@ -69,4 +69,4 @@ else
         ln -s /defaults/nginx/http.conf /etc/nginx/http.d/pterodactyl.conf
     fi
 fi
-log "Initialization complete"
\ No newline at end of file
+log "Initialization complete"