From 27d533dd5bd292a7c1070872759d0d91fd132edb Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 11 Oct 2017 10:07:09 +0200
Subject: [PATCH] New docker things.

---
 Dockerfile           | 7 +------
 docker-compose.yml   | 1 +
 docker/entrypoint.sh | 6 +++++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 358babe19c..a77bb0928c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,12 +46,7 @@ COPY . $FIREFLY_PATH
 
 RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
 
-RUN cat .env.docker | envsubst > .env && cat .env
-RUN composer install --prefer-dist --no-dev
-RUN composer dump-autoload
-RUN php artisan optimize
-RUN php artisan package:discover
-RUN php artisan firefly:instructions install
+RUN composer install --prefer-dist --no-dev --no-scripts
 
 EXPOSE 80
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 92f79e2ea6..8bcdf06244 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,7 @@ services:
       - FF_DB_USER=firefly_db
       - FF_DB_PASSWORD=firefly_db_secret
       - FF_APP_KEY=SomeRandomStringOf32CharsExactly
+      - FF_APP_ENV=production
     ports:
       - "80:80"
     links:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 933e3c1536..5f6409bf3b 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
-# cat .env.docker | envsubst > .env
 
+cat .env.docker | envsubst > .env && cat .env
+composer dump-autoload
+php artisan optimize
+php artisan package:discover
+php artisan firefly:instructions install
 exec apache2-foreground