From 36c77352819e8697946cd90f91eb2c978e52f03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sat, 27 Apr 2019 19:18:26 +0100 Subject: [PATCH] Add the extra.symfony.docker flag --- Dockerfile | 5 +++-- docker/app/docker-entrypoint.sh | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f282f55..2db8134 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,11 @@ COPY ./docker/h2-proxy/default.conf /etc/nginx/conf.d/default.conf ### PHP FROM php:${PHP_VERSION}-fpm-alpine AS symfony_docker_php -RUN apk add --no-cache --virtual .persistent-deps \ +RUN apk add --no-cache \ git \ icu-libs \ - zlib + zlib \ + jq ENV APCU_VERSION 5.1.12 RUN set -eux \ diff --git a/docker/app/docker-entrypoint.sh b/docker/app/docker-entrypoint.sh index 277182f..fa8bbea 100755 --- a/docker/app/docker-entrypoint.sh +++ b/docker/app/docker-entrypoint.sh @@ -16,6 +16,10 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then # 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 + jq '.extra.symfony.docker=true' tmp/composer.json > tmp/composer.tmp.json + rm tmp/composer.json + mv tmp/composer.tmp.json tmp/composer.json + cp -Rp tmp/. . rm -Rf tmp/ elif [ "$APP_ENV" != 'prod' ]; then