From d94c2db67f215fce9dfb906e45fa16998dc1f2bf Mon Sep 17 00:00:00 2001
From: Gunnstein Lye <gunnstein.lye@ez.no>
Date: Thu, 16 Mar 2017 14:38:04 +0100
Subject: [PATCH] fixup! EZP-27060: Re-add SYMFONY_ENV failsafe, and comment in
 .env about INSTALL_EZ_INSTALL_TYPE usage

---
 .env               | 2 +-
 .platform.app.yaml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index a997d86..cba027b 100644
--- a/.env
+++ b/.env
@@ -22,5 +22,5 @@ REDIS_IMAGE=redis
 APP_PROD_IMAGE=my-ez-app
 APP_DOCKER_FILE=Dockerfile
 
-# Install config
+# Install config, used by .platform.app.yaml among others
 INSTALL_EZ_INSTALL_TYPE=clean
diff --git a/.platform.app.yaml b/.platform.app.yaml
index f2b2d3c..5530ee6 100644
--- a/.platform.app.yaml
+++ b/.platform.app.yaml
@@ -47,10 +47,16 @@ hooks:
         composer install --no-dev --prefer-dist --no-progress --no-interaction --optimize-autoloader
         rm web/app_dev.php
         . ./.env
+        if [ -z "$SYMFONY_ENV" ]; then
+            export SYMFONY_ENV=prod
+        fi
         app/console --env=$SYMFONY_ENV assetic:dump
     deploy: |
         set -e
         . ./.env
+        if [ -z "$SYMFONY_ENV" ]; then
+            export SYMFONY_ENV=prod
+        fi
         if [ ! -f web/var/.platform.installed ]; then
             php -d memory_limit=-1 app/console ezplatform:install --env=$SYMFONY_ENV $INSTALL_EZ_INSTALL_TYPE
             touch web/var/.platform.installed