Merge pull request #66 from alexharrington/develop

Fix issue with session timeout config
xibosignage · Jun 26, 2017 · 9efd88d · 9efd88d
2 parents e8d13d6 + ac25e53
commit 9efd88d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/containers/web-dev/Dockerfile b/containers/web-dev/Dockerfile
@@ -47,7 +47,6 @@ RUN sed -i "s/upload_max_filesize = .*$/upload_max_filesize = 1999M/" /etc/php5/
 RUN sed -i "s/max_execution_time = .*$/max_execution_time = 300/" /etc/php5/apache2/php.ini
 RUN sed -i "s/session.gc_probability = .*$/session.gc_probability = 1/" /etc/php5/apache2/php.ini
 RUN sed -i "s/session.gc_divisor = .*$/session.gc_divisor = 100/" /etc/php5/apache2/php.ini
-RUN sed -i "s/session.gc_maxlifetime = .*$/session.gc_maxlifetime = $CMS_PHP_SESSION_GC_MAXLIFETIME/" /etc/php5/apache2/php.ini
 
 # Expose port 80
 EXPOSE 80

diff --git a/containers/web-dev/entrypoint.sh b/containers/web-dev/entrypoint.sh
@@ -203,6 +203,9 @@ then
     /bin/sed -i "s|.*RewriteBase.*$|RewriteBase $CMS_ALIAS|" /var/www/cms/web/.htaccess
 fi
 
+# Configure PHP session.gc_maxlifetime
+sed -i "s/session.gc_maxlifetime = .*$/session.gc_maxlifetime = $CMS_PHP_SESSION_GC_MAXLIFETIME/" /etc/php5/apache2/php.ini
+
 echo "Running maintenance"
 cd /var/www/cms
 su -s /bin/bash -c 'cd /var/www/cms && /usr/bin/php bin/run.php 1' www-data