Need to disable our error pipeline with mountpoint

This commit is contained in:
Deon George 2020-01-25 00:02:13 +11:00
parent f99cd2f308
commit 06e4f0dfcd

4
init
View File

@ -19,8 +19,10 @@ if [ "${role}" = "app" -a -e artisan ]; then
exec /bin/bash exec /bin/bash
fi fi
set +e
mountpoint -q ${php} mountpoint -q ${php}
mp=$? mp=$?
set -e
# Only adjust perms if this is an external mountpoint # Only adjust perms if this is an external mountpoint
if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
@ -45,8 +47,10 @@ if [ "${role}" = "app" -a -e artisan ]; then
NODEV="--no-dev" NODEV="--no-dev"
fi fi
set +e
mountpoint -q ${composer} mountpoint -q ${composer}
mp=$? mp=$?
set -e
if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
[ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer} [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer}