Merge branch 'development'

# Conflicts:
#	Cool Stuff.md
#	templates/Grav/0/docker-compose.yml
This commit is contained in:
WilliamMiceli
2019-06-09 15:42:18 -04:00
32 changed files with 323 additions and 1 deletions

View File

@@ -6,6 +6,8 @@ services:
dns: # Using Cloudflare DNS
- 1.1.1.1
- 1.0.0.1
- 2606:4700:4700::1111
- 2606:4700:4700::1001
labels:
io.rancher.container.pull_image: always
{{- if .Values.HOST_LABEL}}
@@ -29,4 +31,4 @@ services:
- /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
- /Rancher/${DATA_DIR}/Backups:/var/www/backup # Backups
- /Rancher/${DATA_DIR}/Images:/var/www/images # Images
- /Rancher/${DATA_DIR}/User:/var/www/user # User Data
- /Rancher/${DATA_DIR}/User:/var/www/user # User Data