kor-elf/service-captcha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Compare commits

base: kor-elf:748d05f8fc78739b5f9e469fff79b0120b8b32dc
Branches Tags
kor-elf:main
kor-elf:develop
kor-elf:0.8.2
kor-elf:0.8.1
kor-elf:0.8.0
kor-elf:0.7.1
kor-elf:0.7.0
..
compare: kor-elf:4368aec1b1a98a6f4f6d2a55859a8071cafb5313
Branches Tags
kor-elf:develop
kor-elf:main
kor-elf:0.8.2
kor-elf:0.8.1
kor-elf:0.8.0
kor-elf:0.7.1
kor-elf:0.7.0

No commits in common. "748d05f8fc78739b5f9e469fff79b0120b8b32dc" and "4368aec1b1a98a6f4f6d2a55859a8071cafb5313" have entirely different histories.
748d05f8fc ... 4368aec1b1

2 changed files with 5 additions and 9 deletions
Show Stats Expand all files Collapse all files

5
app/docker/docker-entrypoint_dev.sh
View File

@ -5,7 +5,6 @@ set -euo pipefail
WAITLOOPS=5 WAITLOOPS=5
SLEEPSEC=1 SLEEPSEC=1
unitd="unitd" unitd="unitd"
role=${CONTAINER_ROLE:-app}
curl_put() curl_put()
{ {
@ -23,7 +22,7 @@ curl_put()
return 0 return 0
} }
if [ "$role" = "app" ]; then if [ "$unitd" = "unitd" ] || [ "$unitd" = "unitd-debug" ]; then
echo "$0: Launching Unit daemon to perform initial configuration..." echo "$0: Launching Unit daemon to perform initial configuration..."
/usr/sbin/$unitd --control unix:/var/run/control.unit.sock /usr/sbin/$unitd --control unix:/var/run/control.unit.sock
for i in $(/usr/bin/seq $WAITLOOPS); do for i in $(/usr/bin/seq $WAITLOOPS); do
@ -62,7 +61,7 @@ if [ "$role" = "app" ]; then
if [ ! -z ${UNIT_SOURCE+x} ] if [ ! -z ${UNIT_SOURCE+x} ]
then 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" curl_put "/docker-entrypoint.d/unit_source.json" "config/listeners/*:9000/forwarded/source"
fi fi

9
app/docker/docker-entrypoint_prod.sh
View File

@ -5,7 +5,6 @@ set -euo pipefail
WAITLOOPS=5 WAITLOOPS=5
SLEEPSEC=1 SLEEPSEC=1
unitd="unitd" unitd="unitd"
role=${CONTAINER_ROLE:-app}
curl_put() curl_put()
{ {
@ -23,7 +22,7 @@ curl_put()
return 0 return 0
} }
if [ "$role" = "app" ]; then if [ "$unitd" = "unitd" ] || [ "$unitd" = "unitd-debug" ]; then
echo "$0: Launching Unit daemon to perform initial configuration..." echo "$0: Launching Unit daemon to perform initial configuration..."
/usr/sbin/$unitd --control unix:/var/run/control.unit.sock /usr/sbin/$unitd --control unix:/var/run/control.unit.sock
for i in $(/usr/bin/seq $WAITLOOPS); do for i in $(/usr/bin/seq $WAITLOOPS); do
@ -62,7 +61,7 @@ if [ "$role" = "app" ]; then
if [ ! -z ${UNIT_SOURCE+x} ] if [ ! -z ${UNIT_SOURCE+x} ]
then 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" curl_put "/docker-entrypoint.d/unit_source.json" "config/listeners/*:9000/forwarded/source"
fi fi
@ -103,9 +102,7 @@ php artisan config:cache
php artisan event:cache php artisan event:cache
php artisan route:cache php artisan route:cache
php artisan view:cache php artisan view:cache
if [ "$role" = "app" ]; then php artisan migrate --force
php artisan migrate --force
fi
chown -R unit:unit /var/www/html chown -R unit:unit /var/www/html
chown -R www-data:www-data /var/www/html/storage /var/www/html/bootstrap/cache chown -R www-data:www-data /var/www/html/storage /var/www/html/bootstrap/cache