Merge pull request #178 from auchri/patch-3

Add SKIP_COMPOSER flag
This commit is contained in:
Ric Harvey
2017-10-05 13:51:00 +01:00
committed by GitHub
2 changed files with 11 additions and 8 deletions

View File

@@ -24,3 +24,4 @@ The following flags are a list of all the currently supported options that can b
- **REMOVE_FILES** : Use REMOVE_FILES=0 to prevent the script from clearing out /var/www/html (useful for working with local files) - **REMOVE_FILES** : Use REMOVE_FILES=0 to prevent the script from clearing out /var/www/html (useful for working with local files)
- **APPLICATION_ENV** : set this to development to prevent composer deleteing local dev dependancies - **APPLICATION_ENV** : set this to development to prevent composer deleteing local dev dependancies
- **SKIP_CHOWN** : set to 1 to avoid running chown -Rf on /var/www/html - **SKIP_CHOWN** : set to 1 to avoid running chown -Rf on /var/www/html
- **SKIP_COMPOSER** : set to 1 to avoid installing composer

View File

@@ -189,8 +189,9 @@ if [[ "$RUN_SCRIPTS" == "1" ]] ; then
fi fi
fi fi
# Try auto install for composer if [ -z "$SKIP_COMPOSER" ]; then
if [ -f "/var/www/html/composer.lock" ]; then # Try auto install for composer
if [ -f "/var/www/html/composer.lock" ]; then
if [ "$APPLICATION_ENV" == "development" ]; then if [ "$APPLICATION_ENV" == "development" ]; then
composer global require hirak/prestissimo composer global require hirak/prestissimo
composer install --working-dir=/var/www/html composer install --working-dir=/var/www/html
@@ -198,6 +199,7 @@ if [ -f "/var/www/html/composer.lock" ]; then
composer global require hirak/prestissimo composer global require hirak/prestissimo
composer install --no-dev --working-dir=/var/www/html composer install --no-dev --working-dir=/var/www/html
fi fi
fi
fi fi
# Start supervisord and services # Start supervisord and services