Skip to content

Commit f14a977

Browse files
authored
Merge pull request dunglas#49 from dunglas/flex-docker
Add the extra.symfony.docker flag
2 parents 4e521ca + 36c7735 commit f14a977

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ COPY ./docker/h2-proxy/default.conf /etc/nginx/conf.d/default.conf
3232
### PHP
3333
FROM php:${PHP_VERSION}-fpm-alpine AS symfony_docker_php
3434

35-
RUN apk add --no-cache --virtual .persistent-deps \
35+
RUN apk add --no-cache \
3636
git \
3737
icu-libs \
38-
zlib
38+
zlib \
39+
jq
3940

4041
ENV APCU_VERSION 5.1.12
4142
RUN set -eux \

docker/app/docker-entrypoint.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then
1616
# The first time volumes are mounted, the project needs to be recreated
1717
if [ ! -f composer.json ]; then
1818
composer create-project "symfony/skeleton $SYMFONY_VERSION" tmp --stability=$STABILITY --prefer-dist --no-progress --no-interaction
19+
jq '.extra.symfony.docker=true' tmp/composer.json > tmp/composer.tmp.json
20+
rm tmp/composer.json
21+
mv tmp/composer.tmp.json tmp/composer.json
22+
1923
cp -Rp tmp/. .
2024
rm -Rf tmp/
2125
elif [ "$APP_ENV" != 'prod' ]; then

0 commit comments

Comments
 (0)