From bd3d8c654238c701fc944816cd7313694b38bfe9 Mon Sep 17 00:00:00 2001 From: Maxime Helias Date: Sun, 6 Jan 2019 13:48:24 +0100 Subject: [PATCH] Use php.ini depending on env --- Dockerfile | 3 ++- docker/app/{php.ini => conf.d/symfony.ini} | 0 docker/app/docker-entrypoint.sh | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) rename docker/app/{php.ini => conf.d/symfony.ini} (100%) diff --git a/Dockerfile b/Dockerfile index 4cd440c..919822d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,8 @@ RUN set -eux \ && docker-php-ext-enable --ini-name 05-opcache.ini opcache \ && apk del .build-deps -COPY docker/app/php.ini /usr/local/etc/php/php.ini +RUN ln -s $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini +COPY docker/app/conf.d/symfony.ini $PHP_INI_DIR/conf.d/symfony.ini COPY --from=composer:latest /usr/bin/composer /usr/bin/composer COPY docker/app/docker-entrypoint.sh /usr/local/bin/docker-app-entrypoint RUN chmod +x /usr/local/bin/docker-app-entrypoint diff --git a/docker/app/php.ini b/docker/app/conf.d/symfony.ini similarity index 100% rename from docker/app/php.ini rename to docker/app/conf.d/symfony.ini diff --git a/docker/app/docker-entrypoint.sh b/docker/app/docker-entrypoint.sh index 5e63166..277182f 100755 --- a/docker/app/docker-entrypoint.sh +++ b/docker/app/docker-entrypoint.sh @@ -7,6 +7,12 @@ if [ "${1#-}" != "$1" ]; then fi if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then + PHP_INI_RECOMMENDED="$PHP_INI_DIR/php.ini-production" + if [ "$APP_ENV" != 'prod' ]; then + PHP_INI_RECOMMENDED="$PHP_INI_DIR/php.ini-development" + fi + ln -sf "$PHP_INI_RECOMMENDED" "$PHP_INI_DIR/php.ini" + # The first time volumes are mounted, the project needs to be recreated if [ ! -f composer.json ]; then composer create-project "symfony/skeleton $SYMFONY_VERSION" tmp --stability=$STABILITY --prefer-dist --no-progress --no-interaction