Skip to content

Commit

Permalink
Merge pull request #113 from dasgarner/release/2.1
Browse files Browse the repository at this point in the history
Release 2.1.3
  • Loading branch information
dasgarner authored Jan 14, 2020
2 parents 7674e40 + 0776657 commit 43a2b4b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cms_custom-ports.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
mem_limit: 256m
env_file: config.env
cms-web:
image: xibosignage/xibo-cms:release-2.1.1
image: xibosignage/xibo-cms:release-2.1.3
volumes:
- "./shared/cms/custom:/var/www/cms/custom"
- "./shared/backup:/var/www/backup"
Expand Down
2 changes: 1 addition & 1 deletion cms_remote-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
env_file: config.env
mem_limit: 256m
cms-web:
image: xibosignage/xibo-cms:release-2.1.1
image: xibosignage/xibo-cms:release-2.1.3
volumes:
- "./shared/cms/custom:/var/www/cms/custom"
- "./shared/backup:/var/www/backup"
Expand Down
5 changes: 4 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ services:
image: mysql:5.6
volumes:
- "./shared/db:/var/lib/mysql"
restart: always
environment:
- MYSQL_DATABASE=cms
- MYSQL_USER=cms
Expand All @@ -15,16 +16,18 @@ services:
image: xibosignage/xibo-xmr:release-0.7
ports:
- "9505:9505"
restart: always
mem_limit: 256m
env_file: config.env
cms-web:
image: xibosignage/xibo-cms:release-2.1.1
image: xibosignage/xibo-cms:release-2.1.3
volumes:
- "./shared/cms/custom:/var/www/cms/custom"
- "./shared/backup:/var/www/backup"
- "./shared/cms/web/theme/custom:/var/www/cms/web/theme/custom"
- "./shared/cms/library:/var/www/cms/library"
- "./shared/cms/web/userscripts:/var/www/cms/web/userscripts"
restart: always
links:
- cms-db:mysql
- cms-xmr:50001
Expand Down

0 comments on commit 43a2b4b

Please sign in to comment.