Merge pull request #112 from dasgarner/release/23

Release 2.3.0-alpha
xibosignage · Jan 7, 2020 · 1a69333 · 1a69333
2 parents adfdb33 + 27ed6c8
commit 1a69333
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/cms_custom-ports.yml.template b/cms_custom-ports.yml.template
@@ -13,14 +13,14 @@ services:
         mem_limit: 1g
         env_file: config.env
     cms-xmr:
-        image: xibosignage/xibo-xmr:release-0.7
+        image: xibosignage/xibo-xmr:release-0.8
         ports:
             - "65500:9505"
         restart: always
         mem_limit: 256m
         env_file: config.env
     cms-web:
-        image: xibosignage/xibo-cms:release-2.2.1
+        image: xibosignage/xibo-cms:release-2.3.0-alpha
         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
@@ -2,14 +2,14 @@ version: "2.1"
 
 services:
     cms-xmr:
-        image: xibosignage/xibo-xmr:release-0.7
+        image: xibosignage/xibo-xmr:release-0.8
         ports:
             - "9505:9505"
         restart: always
         env_file: config.env
         mem_limit: 256m
     cms-web:
-        image: xibosignage/xibo-cms:release-2.2.1
+        image: xibosignage/xibo-cms:release-2.3.0-alpha
         volumes:
             - "./shared/cms/custom:/var/www/cms/custom"
             - "./shared/backup:/var/www/backup"

diff --git a/config.env.template b/config.env.template
@@ -75,4 +75,9 @@ CMS_SERVER_NAME=cms.example.org
 ## 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
+# CMS_QUICK_CHART_URL=http://cms-quickchart:3400
+
+## Xibo has a CRON based task runner built into the cms-web container. It is sometimes
+# desirable to run this externally and to do so the internal task runner should be disabled
+# by setting this to false. This setting is true by default.
+# $XTR_ENABLED=false
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,14 +13,14 @@ services:
         env_file: config.env
         restart: always
     cms-xmr:
-        image: xibosignage/xibo-xmr:release-0.7
+        image: xibosignage/xibo-xmr:release-0.8
         ports:
             - "9505:9505"
         restart: always
         mem_limit: 256m
         env_file: config.env
     cms-web:
-        image: xibosignage/xibo-cms:release-2.2.1
+        image: xibosignage/xibo-cms:release-2.3.0-alpha
         volumes:
             - "./shared/cms/custom:/var/www/cms/custom"
             - "./shared/backup:/var/www/backup"