docker/php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor optimisation to init
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 3m48s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 12m28s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 11s
Details
Create Docker Image / Build Docker Test Image (x86_64) (push) Successful in 55s
Details
Create Docker Image / Final Docker Test Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George 2024-08-24 22:17:17 +10:00
parent f86ce8e8a8
commit b665751711
1 changed files with 95 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
docker/init
View File

@ -41,12 +41,7 @@ if [ -x /usr/bin/memcached -a "${MEMCACHED_START}" == "TRUE" ]; then
fi fi
# Laravel Specific # Laravel Specific
if [ "${role}" = "app" -a -e artisan ]; then if [ -r artisan -a -e ${php}/.env ]; then
if [ ! -e ${php}/.env ]; then
echo "! ERROR: NO .env file..."
exec /bin/bash
fi
mp=$(mp ${php}) mp=$(mp ${php})
# Only adjust perms if this is an external mountpoint # Only adjust perms if this is an external mountpoint
@ -66,7 +61,6 @@ if [ "${role}" = "app" -a -e artisan ]; then
fi fi
fi fi
if [ "${env}" != "local" -a -r "artisan" ]; then
# See if we need to refresh our dependancies # See if we need to refresh our dependancies
if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then
echo "* Composer installing dependancies..." echo "* Composer installing dependancies..."
@ -89,12 +83,18 @@ if [ "${role}" = "app" -a -e artisan ]; then
fi fi
if [ -e .lumen ]; then if [ -e .lumen ]; then
echo "* Lumen detected..." echo "* Lumen detected, not caching configuration..."
else else
# We only check for non mount points, in case this container has the app inside
mp=$(mp ${php})
if [ ${mp} -eq 1 ]; then
echo "* Caching configuration..." echo "* Caching configuration..."
su www-data -s /bin/sh -c "(php artisan optimize && php artisan view:cache)" su www-data -s /bin/sh -c "(php artisan optimize)"
fi
fi fi
if [ "${role}" = "app" ]; then
if [ "${env}" != "local" ]; then
if [ -z "${IGNORE_MIGRATION}" ]; then if [ -z "${IGNORE_MIGRATION}" ]; then
if [ -r .migrate ]; then if [ -r .migrate ]; then
echo "* Running migration..." echo "* Running migration..."
@ -138,28 +138,13 @@ if [ "${role}" = "app" -a -e artisan ]; then
exec /usr/local/bin/docker-php-entrypoint "$@" exec /usr/local/bin/docker-php-entrypoint "$@"
elif [ "$role" = "queue" -a -e artisan ]; then elif [ "$role" = "queue" ]; then
if [ ! -e ${php}/.env ]; then
echo "! ERROR: NO .env file..."
exec /bin/bash
fi
QUEUE_CMD=work QUEUE_CMD=work
if [ "${env}" == "local" ]; then if [ "${env}" == "local" ]; then
QUEUE_CMD=listen QUEUE_CMD=listen
fi fi
if [ -e .lumen ]; then
echo "* Lumen detected..."
else
# We only check for non mount points, in case this container has the app inside
mp=$(mp ${php})
if [ ${mp} -eq 1 ]; then
echo "* Caching configuration..."
su www-data -s /bin/sh -c "(php artisan config:cache && php artisan route:cache && php artisan view:cache)"
fi
fi
echo "* Running the queue..." echo "* Running the queue..."
# We'll delay starting in case the app is caching # We'll delay starting in case the app is caching
sleep 15 sleep 15
@ -170,33 +155,17 @@ elif [ "$role" = "queue" -a -e artisan ]; then
done done
" "
elif [ "$role" = "scheduler" -a -e artisan ]; then elif [ "$role" = "scheduler" ]; then
if [ ! -e ${php}/.env ]; then
echo "! ERROR: NO .env file..."
exec /bin/bash
fi
if [ -e .lumen ]; then
echo "* Lumen detected..."
else
# We only check for non mount points, in case this container has the app inside
mp=$(mp ${php})
if [ ${mp} -eq 1 ]; then
echo "* Caching configuration..."
su www-data -s /bin/sh -c "(php artisan config:cache && php artisan route:cache && php artisan view:cache)"
fi
fi
echo "* Running the scheduler..." echo "* Running the scheduler..."
# We'll delay starting in case the app is caching # We'll delay starting in case the app is caching
sleep 15 sleep 15
su www-data -s /bin/sh -c " su www-data -s /bin/sh -c "
while true; do while true; do
(php ${PHP_OPTIONS} artisan schedule:run --verbose --no-interaction &) (php ${PHP_OPTIONS} artisan schedule:work --verbose --no-interaction &)
sleep 60
done done
" "
fi
else else
nginx_start nginx_start