From 8976e1f9c29b9516c289bbe99d510b64403566d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Thu, 6 Jul 2017 00:28:13 +0200
Subject: [PATCH] Various fixes

---
 Dockerfile                      |  8 +++-----
 docker-compose.yml              | 14 +++++++-------
 docker/app/docker-entrypoint.sh |  6 +-----
 docker/nginx/Dockerfile         |  2 +-
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ffe399f9b..c99546a38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM php:7.1-fpm-alpine
 RUN apk add --no-cache --virtual .persistent-deps \
 		git \
 		icu-libs \
-                make \
+		make \
 		zlib
 
 ENV APCU_VERSION 5.1.8
@@ -29,8 +29,7 @@ COPY docker/app/install-composer.sh /usr/local/bin/docker-app-install-composer
 RUN chmod +x /usr/local/bin/docker-app-install-composer
 
 RUN set -xe \
-	&& apk add --no-cache --virtual .fetch-deps \
-		openssl \
+	&& apk add --no-cache --virtual .fetch-deps openssl \
 	&& docker-app-install-composer \
 	&& mv composer.phar /usr/local/bin/composer \
 	&& apk del .fetch-deps
@@ -43,8 +42,7 @@ RUN composer global require "hirak/prestissimo:^0.3" --prefer-dist --no-progress
 
 WORKDIR /srv/app
 
-COPY composer.json ./
-COPY composer.lock ./
+COPY composer.* ./
 
 RUN mkdir -p \
 		var/cache \
diff --git a/docker-compose.yml b/docker-compose.yml
index e4ad68391..15ae99945 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,15 +11,15 @@ services:
       - .env
     volumes:
       # Comment out the next line in production
-      - ./:/srv/app:rw
+      - ./:/srv/app/:rw
       # This is for assets:install
-      - ./web:/srv/app/web:rw
+      - ./web/:/srv/app/web/:rw
       # If you develop on Linux, comment out the following volumes to just use bind-mounted project directory from host
-      - /srv/app/var
-      - /srv/app/var/cache
-      - /srv/app/var/logs
-      - /srv/app/var/sessions
-      - /srv/app/vendor
+      - /srv/app/var/
+      - /srv/app/var/cache/
+      - /srv/app/var/logs/
+      - /srv/app/var/sessions/
+      - /srv/app/vendor/
 
   nginx:
     build:
diff --git a/docker/app/docker-entrypoint.sh b/docker/app/docker-entrypoint.sh
index 2882a7319..c7d107e9b 100755
--- a/docker/app/docker-entrypoint.sh
+++ b/docker/app/docker-entrypoint.sh
@@ -7,11 +7,7 @@ if [ "${1#-}" != "$1" ]; then
 fi
 
 if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then
-	# Detect the host IP
-	export DOCKER_BRIDGE_IP
-	DOCKER_BRIDGE_IP=$(ip ro | grep default | cut -d' ' -f 3)
-
-	if [ "$SYMFONY_ENV" = 'prod' ]; then
+	if [ "$APP_ENV" = 'prod' ]; then
 		composer install --prefer-dist --no-dev --no-progress --no-suggest --optimize-autoloader --classmap-authoritative --no-interaction
 	else
 		composer install --prefer-dist --no-progress --no-suggest --no-interaction
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 07b07f0d6..73b0e4f5d 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx:1.11-alpine
+FROM nginx:1.13-alpine
 
 COPY conf.d /etc/nginx/conf.d/