SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hkeio-master'

Browse Source
This commit is contained in:
Ric Harvey
2017-08-25 11:09:37 +01:00
parent 3e486597d6 be4c24c20f
commit 8100a5310b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/start.sh
View File

@@ -62,12 +62,6 @@ if [ ! -d "/var/www/html/.git" ]; then
fi fi
fi fi
# Try auto install for composer
if [ -f "/var/www/html/composer.lock" ]; then
composer global require hirak/prestissimo
composer install --no-dev --working-dir=/var/www/html
fi
# Enable custom nginx config files if they exist # Enable custom nginx config files if they exist
if [ -f /var/www/html/conf/nginx/nginx.conf ]; then if [ -f /var/www/html/conf/nginx/nginx.conf ]; then
cp /var/www/html/conf/nginx/nginx.conf /etc/nginx/nginx.conf cp /var/www/html/conf/nginx/nginx.conf /etc/nginx/nginx.conf
@@ -192,6 +186,17 @@ if [[ "$RUN_SCRIPTS" == "1" ]] ; then
fi fi
fi fi
# Try auto install for composer
if [ -f "/var/www/html/composer.lock" ]; then
if [ "$APPLICATION_ENV" == "development" ]; then
composer global require hirak/prestissimo
composer install --working-dir=/var/www/html
else
composer global require hirak/prestissimo
composer install --no-dev --working-dir=/var/www/html
fi
fi
# Start supervisord and services # Start supervisord and services
exec /usr/bin/supervisord -n -c /etc/supervisord.conf exec /usr/bin/supervisord -n -c /etc/supervisord.conf