mirror of
https://github.com/pelican-dev/panel.git
synced 2025-05-20 00:34:44 +02:00
Merge pull request #700 from BlockyBlockling/skip-caddy-fix
Fixing Docker Environment variable only getting checked for existence instead of value
This commit is contained in:
commit
ac67656d82
6
.github/docker/entrypoint.sh
vendored
6
.github/docker/entrypoint.sh
vendored
@ -52,11 +52,11 @@ crond -L /var/log/crond -l 5
|
|||||||
export SUPERVISORD_CADDY=false
|
export SUPERVISORD_CADDY=false
|
||||||
|
|
||||||
## disable caddy if SKIP_CADDY is set
|
## disable caddy if SKIP_CADDY is set
|
||||||
if [[ -z $SKIP_CADDY ]]; then
|
if [[ "${SKIP_CADDY:-}" == "true" ]]; then
|
||||||
|
echo "Starting PHP-FPM only"
|
||||||
|
else
|
||||||
echo "Starting PHP-FPM and Caddy"
|
echo "Starting PHP-FPM and Caddy"
|
||||||
export SUPERVISORD_CADDY=true
|
export SUPERVISORD_CADDY=true
|
||||||
else
|
|
||||||
echo "Starting PHP-FPM only"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
chown -R www-data:www-data /pelican-data/.env /pelican-data/database
|
chown -R www-data:www-data /pelican-data/.env /pelican-data/database
|
||||||
|
Loading…
x
Reference in New Issue
Block a user