Merge pull request #110 from dasgarner/release/22

Prepare 2.2.0 release
xibosignage · Nov 26, 2019 · 4065723 · 4065723
2 parents 30ce991 + cda3b18
commit 4065723
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 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-2.1.2
+        image: xibosignage/xibo-cms:release-2.2.0
         volumes:
             - "./shared/cms/custom:/var/www/cms/custom"
             - "./shared/backup:/var/www/backup"
@@ -37,3 +37,6 @@ services:
         ports:
             - "65501:80"
         mem_limit: 1g
+    cms-quickchart:
+      image: ianw/quickchart
+      restart: always
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-2.1.2
+        image: xibosignage/xibo-cms:release-2.2.0
         volumes:
             - "./shared/cms/custom:/var/www/cms/custom"
             - "./shared/backup:/var/www/backup"
@@ -25,4 +25,6 @@ services:
             - "80:80"
         env_file: config.env
         mem_limit: 1g
-
+    cms-quickchart:
+      image: ianw/quickchart
+      restart: always
diff --git a/config.env.template b/config.env.template
@@ -68,4 +68,11 @@ CMS_SERVER_NAME=cms.example.org
 ## required
 # CMS_PHP_POST_MAX_SIZE=4G
 # CMS_PHP_UPLOAD_MAX_FILESIZE=4G
-# CMS_PHP_MAX_EXECUTION_TIME=600
+# CMS_PHP_MAX_EXECUTION_TIME=600
+
+## Xibo can email various reports and charts. To do so a charting service
+## is required. Xibo uses QuickChart.io, which has been provided as a container
+## in the Docker Compose files.
+## If needed, you can change the URL of the Quick Chart service to one you provide
+## externally to Xibo's Docker Compose environment
+# CMS_QUICK_CHART_URL=http://cms-quickchart:3400
diff --git a/config.env.template-remote-mysql b/config.env.template-remote-mysql
@@ -48,3 +48,10 @@ CMS_SMTP_FROM_LINE_OVERRIDE=YES
 ## set it
 CMS_SERVER_NAME=cms.example.org
 
+## Xibo can email various reports and charts. To do so a charting service
+## is required. Xibo uses QuickChart.io, which has been provided as a container
+## in the Docker Compose files.
+## If needed, you can change the URL of the Quick Chart service to one you provide
+## externally to Xibo's Docker Compose environment
+# CMS_QUICK_CHART_URL=http://cms-quickchart:3400
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,13 +5,13 @@ services:
         image: mysql:5.6
         volumes:
             - "./shared/db:/var/lib/mysql"
-        restart: always
         environment:
             - MYSQL_DATABASE=cms
             - MYSQL_USER=cms
             - MYSQL_RANDOM_ROOT_PASSWORD=yes
         mem_limit: 1g
         env_file: config.env
+        restart: always
     cms-xmr:
         image: xibosignage/xibo-xmr:release-0.7
         ports:
@@ -20,7 +20,7 @@ services:
         mem_limit: 256m
         env_file: config.env
     cms-web:
-        image: xibosignage/xibo-cms:release-2.1.2
+        image: xibosignage/xibo-cms:release-2.2.0
         volumes:
             - "./shared/cms/custom:/var/www/cms/custom"
             - "./shared/backup:/var/www/backup"
@@ -37,3 +37,6 @@ services:
         ports:
             - "80:80"
         mem_limit: 1g
+    cms-quickchart:
+      image: ianw/quickchart
+      restart: always