Revert to bash, wait-for-it needs it

This commit is contained in:
2024-01-23 13:31:38 -06:00
parent 3c29d6d460
commit 14037c60e4
6 changed files with 7 additions and 6 deletions

View File

@@ -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 && \

View File

@@ -1,3 +1,3 @@
#!/command/with-contenv sh
#!/command/with-contenv bash
/usr/sbin/crond -fL /dev/null

View File

@@ -1,3 +1,3 @@
#!/command/with-contenv sh
#!/command/with-contenv bash
/usr/sbin/nginx -g "daemon off;"

View File

@@ -1,3 +1,3 @@
#!/command/with-contenv sh
#!/command/with-contenv bash
/usr/sbin/php-fpm -Fc /etc/php

View File

@@ -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

View File

@@ -1,4 +1,4 @@
#!/command/with-contenv sh
#!/command/with-contenv bash
source ContainerTools
SNAME=${0##*/}