🗃️ Committing everything that changed 🗃️

This commit is contained in:
casjay 2022-10-04 23:03:23 -04:00
parent d1f5e78d17
commit 0ffc23312a
No known key found for this signature in database
GPG Key ID: 4F765975C1F0EE5F
3 changed files with 9 additions and 6 deletions

View File

@ -23,6 +23,7 @@ RUN mkdir -p /bin/ /config/ /data/ /dist/nextcloud/ && \
echo "http://dl-cdn.alpinelinux.org/alpine/$ALPINE_VERSION/testing" >> /etc/apk/repositories && \
apk update -U --no-cache \
apk add --no-cache \
openrc \
icu-data-full \
curl \
gnupg \

View File

@ -94,7 +94,7 @@ fi
[ -f "/etc/.env.sh" ] && rm -Rf "/etc/.env.sh"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Additional commands
[ -f "/run/openrc/softlevel" ] || openrc -n sysinit
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case "$1" in
--help) # Help message
@ -102,12 +102,13 @@ case "$1" in
echo "Usage: $APPNAME [healthcheck, bash, command]"
echo "Failed command will have exit code 10"
echo
exitCode=$?
exit $?
;;
healthcheck) # Docker healthcheck
/usr/local/bin/healthcheck
exitCode=$?
netstat -taupln | grep -q "php-fpm" &&
netstat -taupln | grep -q "nginx"
exit $?
;;
*/bin/sh | */bin/bash | bash | shell | sh) # Launch shell
@ -118,7 +119,8 @@ healthcheck) # Docker healthcheck
*) # Execute primary command
if [ $# -eq 0 ]; then
__exec_bash "/bin/bash"
/etc/init.d/php-fpm8 status | grep 'status: started' || /etc/init.d/php8-fpm start
/etc/init.d/nginx status | grep 'status: started' || /etc/init.d/nginx start
else
__exec_bash "/bin/bash"
fi

View File

@ -6,5 +6,5 @@ if [ "$SIDECAR_NEWSUPDATER" = "1" ]; then
elif [ "$SIDECAR_CRON" = "1" ] || [ "$SIDECAR_PREVIEWGEN" = "1" ]; then
pgrep -f "busybox crond -f -L /dev/stdout"
else
curl --fail http://127.0.0.1:12345/ping || exit 1
curl --fail http://127.0.0.1:80/ping || exit 1
fi