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

Fix typo in previous commit

Browse Source
This commit is contained in:
Deon George 2020-01-15 14:50:14 +11:00
parent 851daf659e
commit 9b4df6abb1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
init
View File

@ -4,6 +4,7 @@ set -e
role=${CONTAINER_ROLE:-app} role=${CONTAINER_ROLE:-app}
env=${APP_ENV:-live} env=${APP_ENV:-live}
php=${PHP_DIR:-/var/www/html} php=${PHP_DIR:-/var/www/html}
composer=${COMPOSER_DIR:-/var/www/.composer}
# General Setup # General Setup
if [ -x /usr/sbin/sshd -a "${SSH_START}" = "TRUE" ]; then if [ -x /usr/sbin/sshd -a "${SSH_START}" = "TRUE" ]; then
@ -13,7 +14,7 @@ fi
# Laravel Specific # Laravel Specific
if [ "${role}" = "app" -a -e artisan ]; then if [ "${role}" = "app" -a -e artisan ]; then
if [ ! -e ${php}.env ]; then if [ ! -e ${php}/.env ]; then
echo "! ERROR: NO .env file..." echo "! ERROR: NO .env file..."
exec /bin/bash exec /bin/bash
fi fi
@ -28,6 +29,7 @@ if [ "${role}" = "app" -a -e artisan ]; then
# See if we need to refresh our dependancies # See if we need to refresh our dependancies
if [[ -r composer.lock && ( -e .composer.refresh || ! -d vendor ) ]]; then if [[ -r composer.lock && ( -e .composer.refresh || ! -d vendor ) ]]; then
rm -f ${php}/bootstrap/cache/*.php rm -f ${php}/bootstrap/cache/*.php
chown -R www-data:www-data ${composer}
su www-data -s /bin/sh -c "composer install" && ( test -e .composer.refresh && rm -f .composer.refresh ) su www-data -s /bin/sh -c "composer install" && ( test -e .composer.refresh && rm -f .composer.refresh )
fi fi
@ -43,7 +45,7 @@ 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" -a -e artisan ]; then
if [ ! -e ${php}.env ]; then if [ ! -e ${php}/.env ]; then
echo "! ERROR: NO .env file..." echo "! ERROR: NO .env file..."
exec /bin/bash exec /bin/bash
fi fi
@ -56,7 +58,7 @@ elif [ "$role" = "queue" -a -e artisan ]; then
done done
elif [ "$role" = "scheduler" -a -e artisan ]; then elif [ "$role" = "scheduler" -a -e artisan ]; then
if [ ! -e ${php}.env ]; then if [ ! -e ${php}/.env ]; then
echo "! ERROR: NO .env file..." echo "! ERROR: NO .env file..."
exec /bin/bash exec /bin/bash
fi fi