diff --git a/.docker/php/conf.d/armaforces-web.prod.ini b/.docker/php/conf.d/armaforces-web.prod.ini index d9a6c5f8..a941b3bd 100644 --- a/.docker/php/conf.d/armaforces-web.prod.ini +++ b/.docker/php/conf.d/armaforces-web.prod.ini @@ -1,2 +1,2 @@ -opcache.preload_user = www-data -opcache.preload = /www/app/config/preload.php +;opcache.preload_user = www-data +;opcache.preload = /www/app/config/preload.php diff --git a/.docker/php/docker-entrypoint.sh b/.docker/php/docker-entrypoint.sh index 8efb0283..3f1a7593 100644 --- a/.docker/php/docker-entrypoint.sh +++ b/.docker/php/docker-entrypoint.sh @@ -9,15 +9,12 @@ if [ "${1#-}" != "$1" ]; then fi if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then - PHP_INI_RECOMMENDED="$PHP_INI_DIR/php.ini-production" + setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var + setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var + if [ "$APP_ENV" != 'prod' ]; then - PHP_INI_RECOMMENDED="$PHP_INI_DIR/php.ini-development" + composer install --prefer-dist --no-progress --no-interaction || true fi - ln -sf "$PHP_INI_RECOMMENDED" "$PHP_INI_DIR/php.ini" - - mkdir -p var/cache var/log - setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var || true - setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var || true if [ "$APP_ENV" = 'prod' ]; then php bin/console doctrine:migrations:migrate --allow-no-migration --no-interaction