From 14037c60e4886811b33ddb9c9a8df41102fe4abd Mon Sep 17 00:00:00 2001
From: Mindfang <mindfang@taco.quest>
Date: Tue, 23 Jan 2024 13:31:38 -0600
Subject: [PATCH] Revert to bash, wait-for-it needs it

---
 Dockerfile                              | 3 ++-
 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 | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 71fd737..f9cb160 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ ENV PHP_VER="php81" \
     NODE_OPTIONS=--openssl-legacy-provider
 
 RUN apk --no-cache add \
+        bash \
         curl \
         nginx \
         ${PHP_VER} \
@@ -77,7 +78,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/sh/ContainerTools /usr/bin/ContainerTools
+ADD https://gitea.taco.quest/Mindfang/ProjectTools/raw/branch/main/DockerUtilities/bash/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 e188854..1396db5 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 sh
+#!/command/with-contenv bash
 
 /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 ac8ed5a..34cb95c 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 sh
+#!/command/with-contenv bash
 
 /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 6eccf6f..81c05e8 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 sh
+#!/command/with-contenv bash
 
 /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 54d3ab0..86617dc 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 sh
+#!/command/with-contenv bash
 
 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 a86ecb8..0d118b2 100644
--- a/root/etc/s6-overlay/scripts/initializer
+++ b/root/etc/s6-overlay/scripts/initializer
@@ -1,4 +1,4 @@
-#!/command/with-contenv sh
+#!/command/with-contenv bash
 
 source ContainerTools
 SNAME=${0##*/}