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:
commit
34f3d704f3
@ -40,10 +40,10 @@ ARG STABILITY=stable
|
|||||||
ENV STABILITY ${STABILITY}
|
ENV STABILITY ${STABILITY}
|
||||||
|
|
||||||
# Allow to select skeleton version
|
# Allow to select skeleton version
|
||||||
ARG VERSION=""
|
ARG SYMFONY_VERSION=""
|
||||||
|
|
||||||
# Download the Symfony skeleton and leverage Docker cache layers
|
# 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 ###
|
||||||
###< recipes ###
|
###< recipes ###
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
VERSION: ${SYMFONY_VERSION}
|
SYMFONY_VERSION: ${SYMFONY_VERSION}
|
||||||
STABILITY: stable
|
STABILITY: stable
|
||||||
volumes:
|
volumes:
|
||||||
# Comment out the next line in production
|
# Comment out the next line in production
|
||||||
@ -15,6 +15,8 @@ services:
|
|||||||
- /srv/app/var/cache/
|
- /srv/app/var/cache/
|
||||||
- /srv/app/var/logs/
|
- /srv/app/var/logs/
|
||||||
- /srv/app/var/sessions/
|
- /srv/app/var/sessions/
|
||||||
|
environment:
|
||||||
|
- SYMFONY_VERSION
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
build:
|
build:
|
||||||
|
@ -9,7 +9,7 @@ fi
|
|||||||
if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then
|
if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then
|
||||||
# The first time volumes are mounted, the project needs to be recreated
|
# The first time volumes are mounted, the project needs to be recreated
|
||||||
if [ ! -f composer.json ]; then
|
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/. .
|
cp -Rp tmp/. .
|
||||||
rm -Rf tmp/
|
rm -Rf tmp/
|
||||||
elif [ "$APP_ENV" != 'prod' ]; then
|
elif [ "$APP_ENV" != 'prod' ]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user