mirror of
https://codeberg.org/icewind/haze.git
synced 2026-06-03 17:14:08 +02:00
use supervisord in image
This commit is contained in:
parent
0105c60a09
commit
6fdadd9bad
9 changed files with 47 additions and 17 deletions
|
|
@ -28,8 +28,6 @@ echo "{}" > /var/www/html/build/integration/composer.lock
|
|||
|
||||
echo "Starting server using $SQL database…"
|
||||
|
||||
# tail --follow --retry /var/log/nginx/*.log /var/log/cron/owncloud.log &
|
||||
|
||||
chmod +sx /sbin/sudo
|
||||
|
||||
mkdir -p /var/log/nginx /tmp /var/run/blackfire
|
||||
|
|
@ -57,23 +55,15 @@ fi
|
|||
|
||||
if [ -n "${REDIS_TLS:-}" ]
|
||||
then
|
||||
redis-server --protected-mode no \
|
||||
--tls-port 6379 --port 0 \
|
||||
--tls-cert-file /certificates/redis/server.crt \
|
||||
--tls-key-file /certificates/redis/server.key \
|
||||
--tls-ca-cert-file /certificates/redis/ca.crt &
|
||||
cp /etc/supervisor/redis-tls.conf /etc/supervisor/enabled/
|
||||
else
|
||||
redis-server --protected-mode no &
|
||||
cp /etc/supervisor/redis-plain.conf /etc/supervisor/enabled/
|
||||
fi
|
||||
|
||||
if [ -n "${BLACKFIRE_SERVER_ID:-}" ]
|
||||
then
|
||||
sh -c '
|
||||
yes | blackfire agent:config --server-id=$BLACKFIRE_SERVER_ID --server-token=$BLACKFIRE_SERVER_TOKEN
|
||||
BLACKFIRE_LOG_LEVEL=4 BLACKFIRE_LOG_FILE=/var/log/agent.log blackfire agent &
|
||||
'&
|
||||
blackfire agent:config --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN"
|
||||
cp /etc/supervisor/blackfire.conf /etc/supervisor/enabled/
|
||||
fi
|
||||
|
||||
php-fpm --fpm-config /etc/php-fpm.conf&
|
||||
|
||||
nginx -c /etc/nginx.conf
|
||||
exec supervisord -c /etc/supervisor/supervisord.conf
|
||||
Loading…
Add table
Add a link
Reference in a new issue