Merge pull request 'Версия 0.8.1' (#5) from develop into main
Reviewed-on: #5
This commit is contained in:
commit
748d05f8fc
@ -5,6 +5,7 @@ set -euo pipefail
|
||||
WAITLOOPS=5
|
||||
SLEEPSEC=1
|
||||
unitd="unitd"
|
||||
role=${CONTAINER_ROLE:-app}
|
||||
|
||||
curl_put()
|
||||
{
|
||||
@ -22,7 +23,7 @@ curl_put()
|
||||
return 0
|
||||
}
|
||||
|
||||
if [ "$unitd" = "unitd" ] || [ "$unitd" = "unitd-debug" ]; then
|
||||
if [ "$role" = "app" ]; then
|
||||
echo "$0: Launching Unit daemon to perform initial configuration..."
|
||||
/usr/sbin/$unitd --control unix:/var/run/control.unit.sock
|
||||
for i in $(/usr/bin/seq $WAITLOOPS); do
|
||||
@ -61,7 +62,7 @@ if [ "$unitd" = "unitd" ] || [ "$unitd" = "unitd-debug" ]; then
|
||||
|
||||
if [ ! -z ${UNIT_SOURCE+x} ]
|
||||
then
|
||||
echo "[${UNIT_SOURCE}]" > /docker-entrypoint.d/unit_source.json
|
||||
echo $UNIT_SOURCE > /docker-entrypoint.d/unit_source.json
|
||||
curl_put "/docker-entrypoint.d/unit_source.json" "config/listeners/*:9000/forwarded/source"
|
||||
fi
|
||||
|
||||
|
@ -5,6 +5,7 @@ set -euo pipefail
|
||||
WAITLOOPS=5
|
||||
SLEEPSEC=1
|
||||
unitd="unitd"
|
||||
role=${CONTAINER_ROLE:-app}
|
||||
|
||||
curl_put()
|
||||
{
|
||||
@ -22,7 +23,7 @@ curl_put()
|
||||
return 0
|
||||
}
|
||||
|
||||
if [ "$unitd" = "unitd" ] || [ "$unitd" = "unitd-debug" ]; then
|
||||
if [ "$role" = "app" ]; then
|
||||
echo "$0: Launching Unit daemon to perform initial configuration..."
|
||||
/usr/sbin/$unitd --control unix:/var/run/control.unit.sock
|
||||
for i in $(/usr/bin/seq $WAITLOOPS); do
|
||||
@ -61,7 +62,7 @@ if [ "$unitd" = "unitd" ] || [ "$unitd" = "unitd-debug" ]; then
|
||||
|
||||
if [ ! -z ${UNIT_SOURCE+x} ]
|
||||
then
|
||||
echo "[${UNIT_SOURCE}]" > /docker-entrypoint.d/unit_source.json
|
||||
echo $UNIT_SOURCE > /docker-entrypoint.d/unit_source.json
|
||||
curl_put "/docker-entrypoint.d/unit_source.json" "config/listeners/*:9000/forwarded/source"
|
||||
fi
|
||||
|
||||
@ -102,7 +103,9 @@ php artisan config:cache
|
||||
php artisan event:cache
|
||||
php artisan route:cache
|
||||
php artisan view:cache
|
||||
if [ "$role" = "app" ]; then
|
||||
php artisan migrate --force
|
||||
fi
|
||||
|
||||
chown -R unit:unit /var/www/html
|
||||
chown -R www-data:www-data /var/www/html/storage /var/www/html/bootstrap/cache
|
||||
|
Loading…
Reference in New Issue
Block a user