Merge pull request #1186 from snipe/docker_fix2

Fix for #1052 - hopefully make it less brittle in future as well.
snipe · Sep 21, 2015 · 2df8c6a · 2df8c6a
2 parents d41c3fd + 49a20c7
commit 2df8c6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,12 +33,10 @@ RUN a2enmod rewrite
 
 ############ INITIAL APPLICATION SETUP #####################
 
-COPY docker/app_start.patch /tmp/app_start.patch
-
 WORKDIR /var/www/html
 
-#Patch bootstrap file
-RUN patch -p1 < /tmp/app_start.patch
+#Append to bootstrap file (less brittle than 'patch')
+RUN sed -i 's/return $app;/$env="production";\nreturn $app;/' bootstrap/start.php
 
 #copy all configuration files
 COPY docker/*.php /var/www/html/app/config/production/

diff --git a/docker/app_start.patch b/docker/app_start.patch