Merge pull request #49 from dunglas/flex-docker

Add the extra.symfony.docker flag
This commit is contained in:
Kévin Dunglas 2019-04-28 07:03:55 +01:00 committed by GitHub
commit f14a977747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -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 \

View File

@ -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