Merge pull request #75 from alexharrington/develop

1.8.5
xibosignage · Jan 29, 2018 · 88249c0 · 88249c0
2 parents 8e2317e + cfdc04b
commit 88249c0
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 764 deletions.
diff --git a/cms_custom-ports.yml.template b/cms_custom-ports.yml.template
@@ -20,7 +20,7 @@ services:
         mem_limit: 256m
         env_file: config.env
     cms-web:
-        image: xibosignage/xibo-cms:release-1.8.4
+        image: xibosignage/xibo-cms:release-1.8.5
         volumes:
             - "./shared/cms/custom:/var/www/cms/custom"
             - "./shared/backup:/var/www/backup"

diff --git a/cms_remote-mysql.yml b/cms_remote-mysql.yml
@@ -9,7 +9,7 @@ services:
         env_file: config.env
         mem_limit: 256m
     cms-web:
-        image: xibosignage/xibo-cms:release-1.8.4
+        image: xibosignage/xibo-cms:release-1.8.5
         volumes:
             - "./shared/cms/custom:/var/www/cms/custom"
             - "./shared/backup:/var/www/backup"

diff --git a/config.env.template b/config.env.template
@@ -60,4 +60,12 @@ CMS_SERVER_NAME=cms.example.org
 ## Sometimes you want Xibo to run in a sub directory of the webserver
 ## rather than at the root. If so, specify it here. Comment it out to
 ## use the web root.
-# CMS_ALIAS=/xibo
+# CMS_ALIAS=/xibo
+
+
+## Xibo comes with a 2GB limit for individual file uploads
+## If you require larger files, uncomment the following and adjust as
+## required
+# CMS_PHP_POST_MAX_SIZE=4G
+# CMS_PHP_UPLOAD_MAX_FILESIZE=4G
+# CMS_PHP_MAX_EXECUTION_TIME=600
diff --git a/containers/web/Dockerfile b/containers/web/Dockerfile
diff --git a/containers/web/Dockerfile.dev b/containers/web/Dockerfile.dev
diff --git a/containers/web/anacron b/containers/web/anacron
diff --git a/containers/web/apache-config.conf b/containers/web/apache-config.conf