Improve volume handling

Author: dunglas

Dockerfile

@@ -48,10 +48,7 @@ RUN rm -Rf docker/ Dockerfile docker-compose.yml
 ENV SKELETON_COMPOSER_JSON https://raw.githubusercontent.com/symfony/skeleton/v3.3.2/composer.json
 RUN [ -f composer.json ] || php -r "copy('$SKELETON_COMPOSER_JSON', 'composer.json');"
 
-RUN mkdir -p \
-		var/cache \
-		var/logs \
-		var/sessions \
+RUN mkdir -p var/cache var/logs var/sessions \
     && composer install --prefer-dist --no-dev --no-progress --no-suggest --optimize-autoloader --classmap-authoritative --no-interaction \
 	&& composer clear-cache \
 # Permissions hack because setfacl does not work on Mac and Windows

docker-compose.yml

@@ -5,8 +5,6 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
-    #depends_on:
-    #  - db
     volumes:
       # Comment out the next line in production
       - ./:/srv/app:rw
@@ -15,6 +13,7 @@ services:
       - /srv/app/var/cache/
       - /srv/app/var/logs/
       - /srv/app/var/sessions/
+      - /srv/app/vendor/
 
   nginx:
     build:

docker/app/docker-entrypoint.sh

@@ -7,13 +7,12 @@ if [ "${1#-}" != "$1" ]; then
 fi
 
 if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then
-	if [ "$APP_ENV" != 'prod' ]; then
-	    if [ ! -f composer.json ]; then
-	        php -r "copy('$SKELETON_COMPOSER_JSON', 'composer.json');"
-        fi
-	    mkdir -p var
-		composer install --prefer-dist --no-progress --no-suggest --no-interaction
-	fi
+    # The first time volumes are mounted, dependencies need to be reinstalled
+    if [ ! -f composer.json ]; then
+        rm -Rf vendor/*
+        php -r "copy('$SKELETON_COMPOSER_JSON', 'composer.json');"
+        composer install --prefer-dist --no-progress --no-suggest --no-interaction
+    fi
 
 	# Permissions hack because setfacl does not work on Mac and Windows
 	chown -R www-data var