Merge pull request #22 from kejwmen/fix/installing-specific-version

Use SYMFONY_VERSION as a variable name everywhere to avoid mistakes
This commit is contained in:
Kévin Dunglas 2018-06-24 16:27:23 +02:00 committed by GitHub
commit 34f3d704f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions

View File

@ -40,10 +40,10 @@ ARG STABILITY=stable
ENV STABILITY ${STABILITY}
# Allow to select skeleton version
ARG VERSION=""
ARG SYMFONY_VERSION=""
# Download the Symfony skeleton and leverage Docker cache layers
RUN composer create-project "symfony/skeleton ${VERSION}" . --stability=$STABILITY --prefer-dist --no-dev --no-progress --no-scripts --no-plugins --no-interaction
RUN composer create-project "symfony/skeleton ${SYMFONY_VERSION}" . --stability=$STABILITY --prefer-dist --no-dev --no-progress --no-scripts --no-plugins --no-interaction
###> recipes ###
###< recipes ###

View File

@ -5,7 +5,7 @@ services:
build:
context: .
args:
VERSION: ${SYMFONY_VERSION}
SYMFONY_VERSION: ${SYMFONY_VERSION}
STABILITY: stable
volumes:
# Comment out the next line in production
@ -15,6 +15,8 @@ services:
- /srv/app/var/cache/
- /srv/app/var/logs/
- /srv/app/var/sessions/
environment:
- SYMFONY_VERSION
nginx:
build:

View File

@ -9,7 +9,7 @@ fi
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 $VERSION" tmp --stability=$STABILITY --prefer-dist --no-progress --no-interaction
composer create-project "symfony/skeleton $SYMFONY_VERSION" tmp --stability=$STABILITY --prefer-dist --no-progress --no-interaction
cp -Rp tmp/. .
rm -Rf tmp/
elif [ "$APP_ENV" != 'prod' ]; then