Minor optimisation to init
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 3m48s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 12m28s
Create Docker Image / Final Docker Image Manifest (push) Successful in 11s
Create Docker Image / Build Docker Test Image (x86_64) (push) Successful in 55s
Create Docker Image / Final Docker Test Image Manifest (push) Successful in 10s
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 3m48s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 12m28s
Create Docker Image / Final Docker Image Manifest (push) Successful in 11s
Create Docker Image / Build Docker Test Image (x86_64) (push) Successful in 55s
Create Docker Image / Final Docker Test Image Manifest (push) Successful in 10s
This commit is contained in:
parent
f86ce8e8a8
commit
b665751711
221
docker/init
221
docker/init
@ -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,138 +61,112 @@ 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..."
|
|
||||||
|
|
||||||
rm -f ${php}/bootstrap/cache/*.php
|
rm -f ${php}/bootstrap/cache/*.php
|
||||||
if [ "${env}" != "local" ]; then
|
if [ "${env}" != "local" ]; then
|
||||||
NODEV="--no-dev"
|
NODEV="--no-dev"
|
||||||
fi
|
|
||||||
|
|
||||||
mp=$(mp ${composer})
|
|
||||||
|
|
||||||
if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
|
|
||||||
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer}
|
|
||||||
[ ! -d ${php}/vendor ] && mkdir -m 750 ${php}/vendor && chown www-data:www-data ${php}/vendor
|
|
||||||
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chmod g+w ${php}
|
|
||||||
fi
|
|
||||||
|
|
||||||
su www-data -s /bin/sh -c "composer install --optimize-autoloader ${NODEV}" && ( test -e .composer.refresh && rm -f .composer.refresh )
|
|
||||||
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php}
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e .lumen ]; then
|
mp=$(mp ${composer})
|
||||||
echo "* Lumen detected..."
|
|
||||||
else
|
if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
|
||||||
|
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer}
|
||||||
|
[ ! -d ${php}/vendor ] && mkdir -m 750 ${php}/vendor && chown www-data:www-data ${php}/vendor
|
||||||
|
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chmod g+w ${php}
|
||||||
|
fi
|
||||||
|
|
||||||
|
su www-data -s /bin/sh -c "composer install --optimize-autoloader ${NODEV}" && ( test -e .composer.refresh && rm -f .composer.refresh )
|
||||||
|
[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php}
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e .lumen ]; then
|
||||||
|
echo "* Lumen detected, not caching configuration..."
|
||||||
|
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
|
|
||||||
|
|
||||||
if [ -z "${IGNORE_MIGRATION}" ]; then
|
|
||||||
if [ -r .migrate ]; then
|
|
||||||
echo "* Running migration..."
|
|
||||||
# If DB_HOST not set, source the env file
|
|
||||||
[ -z "${DB_HOST}" -a -r .env ] && . .env
|
|
||||||
|
|
||||||
if [ -n "${DB_HOST}" -a -n "${DB_PORT}" ]; then
|
|
||||||
while ! wait-for-it -h ${DB_HOST} -p ${DB_PORT} -t 5 -q; do
|
|
||||||
echo "? Waiting for database at ${DB_HOST}:${DB_PORT}"
|
|
||||||
sleep 1;
|
|
||||||
done
|
|
||||||
echo "- DB is active on ${DB_HOST}:${DB_PORT}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
su www-data -s /bin/sh -c "php artisan migrate" && rm -f .migrate
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
[ -r .migrate ] && echo "! NOTE: Migration ignored due to IGNORE_MIGRATION"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If passport is installed
|
|
||||||
if [ -d ${php}/vendor/laravel/passport ]; then
|
|
||||||
echo "* Generating OAUTH keys ..."
|
|
||||||
set +e
|
|
||||||
su www-data -s /bin/sh -c "php artisan passport:keys"
|
|
||||||
set -e
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
nginx_start
|
if [ "${role}" = "app" ]; then
|
||||||
|
if [ "${env}" != "local" ]; then
|
||||||
|
if [ -z "${IGNORE_MIGRATION}" ]; then
|
||||||
|
if [ -r .migrate ]; then
|
||||||
|
echo "* Running migration..."
|
||||||
|
# If DB_HOST not set, source the env file
|
||||||
|
[ -z "${DB_HOST}" -a -r .env ] && . .env
|
||||||
|
|
||||||
|
if [ -n "${DB_HOST}" -a -n "${DB_PORT}" ]; then
|
||||||
|
while ! wait-for-it -h ${DB_HOST} -p ${DB_PORT} -t 5 -q; do
|
||||||
|
echo "? Waiting for database at ${DB_HOST}:${DB_PORT}"
|
||||||
|
sleep 1;
|
||||||
|
done
|
||||||
|
echo "- DB is active on ${DB_HOST}:${DB_PORT}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
su www-data -s /bin/sh -c "php artisan migrate" && rm -f .migrate
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
[ -r .migrate ] && echo "! NOTE: Migration ignored due to IGNORE_MIGRATION"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If passport is installed
|
||||||
|
if [ -d ${php}/vendor/laravel/passport ]; then
|
||||||
|
echo "* Generating OAUTH keys ..."
|
||||||
|
set +e
|
||||||
|
su www-data -s /bin/sh -c "php artisan passport:keys"
|
||||||
|
set -e
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
nginx_start
|
||||||
|
|
||||||
|
if [ "${LOCAL_QUEUE}" = "TRUE" ]; then
|
||||||
|
echo "* Starting local queue for [$(hostname)${LOCAL_QUEUES:+,${LOCAL_QUEUES}}] with job timeout of [${WORK_TIMEOUT:-90}], trying [${WORK_TRIES:-1}] times..."
|
||||||
|
su www-data -s /bin/sh -c "
|
||||||
|
(while true; do php ${PHP_OPTIONS} artisan queue:work --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} --queue=$(hostname)${LOCAL_QUEUES:+,${LOCAL_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}; done) &
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
||||||
|
set +e
|
||||||
|
[ -x init-php.sh ] && su www-data -s /bin/bash "init-php.sh" &
|
||||||
|
|
||||||
|
exec /usr/local/bin/docker-php-entrypoint "$@"
|
||||||
|
|
||||||
|
elif [ "$role" = "queue" ]; then
|
||||||
|
QUEUE_CMD=work
|
||||||
|
|
||||||
|
if [ "${env}" == "local" ]; then
|
||||||
|
QUEUE_CMD=listen
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "* Running the queue..."
|
||||||
|
# We'll delay starting in case the app is caching
|
||||||
|
sleep 15
|
||||||
|
|
||||||
if [ "${LOCAL_QUEUE}" = "TRUE" ]; then
|
|
||||||
echo "* Starting local queue for [$(hostname)${LOCAL_QUEUES:+,${LOCAL_QUEUES}}] with job timeout of [${WORK_TIMEOUT:-90}], trying [${WORK_TRIES:-1}] times..."
|
|
||||||
su www-data -s /bin/sh -c "
|
su www-data -s /bin/sh -c "
|
||||||
(while true; do php ${PHP_OPTIONS} artisan queue:work --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} --queue=$(hostname)${LOCAL_QUEUES:+,${LOCAL_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}; done) &
|
while true; do
|
||||||
|
php ${PHP_OPTIONS} artisan queue:${QUEUE_CMD} --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} ${WORK_QUEUES:+--queue=${WORK_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}
|
||||||
|
done
|
||||||
|
"
|
||||||
|
|
||||||
|
elif [ "$role" = "scheduler" ]; then
|
||||||
|
echo "* Running the scheduler..."
|
||||||
|
# We'll delay starting in case the app is caching
|
||||||
|
sleep 15
|
||||||
|
|
||||||
|
su www-data -s /bin/sh -c "
|
||||||
|
while true; do
|
||||||
|
(php ${PHP_OPTIONS} artisan schedule:work --verbose --no-interaction &)
|
||||||
|
done
|
||||||
"
|
"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set +e
|
|
||||||
[ -x init-php.sh ] && su www-data -s /bin/bash "init-php.sh" &
|
|
||||||
|
|
||||||
exec /usr/local/bin/docker-php-entrypoint "$@"
|
|
||||||
|
|
||||||
elif [ "$role" = "queue" -a -e artisan ]; then
|
|
||||||
if [ ! -e ${php}/.env ]; then
|
|
||||||
echo "! ERROR: NO .env file..."
|
|
||||||
exec /bin/bash
|
|
||||||
fi
|
|
||||||
|
|
||||||
QUEUE_CMD=work
|
|
||||||
if [ "${env}" == "local" ]; then
|
|
||||||
QUEUE_CMD=listen
|
|
||||||
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..."
|
|
||||||
# We'll delay starting in case the app is caching
|
|
||||||
sleep 15
|
|
||||||
|
|
||||||
su www-data -s /bin/sh -c "
|
|
||||||
while true; do
|
|
||||||
php ${PHP_OPTIONS} artisan queue:${QUEUE_CMD} --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} ${WORK_QUEUES:+--queue=${WORK_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}
|
|
||||||
done
|
|
||||||
"
|
|
||||||
|
|
||||||
elif [ "$role" = "scheduler" -a -e artisan ]; 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..."
|
|
||||||
# We'll delay starting in case the app is caching
|
|
||||||
sleep 15
|
|
||||||
|
|
||||||
su www-data -s /bin/sh -c "
|
|
||||||
while true; do
|
|
||||||
(php ${PHP_OPTIONS} artisan schedule:run --verbose --no-interaction &)
|
|
||||||
sleep 60
|
|
||||||
done
|
|
||||||
"
|
|
||||||
|
|
||||||
else
|
else
|
||||||
nginx_start
|
nginx_start
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user