William/Personal-Rancher-Catalog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor updates, also now using Postgres

Browse Source
This commit is contained in:
WilliamMiceli
2019-01-16 15:33:26 -05:00
parent ea160ec2fe
commit 68505b1ec4
1 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
templates/Guacamole/0/docker-compose.yml
View File

@@ -7,39 +7,33 @@ services:
- 1.1.1.1 - 1.1.1.1
- 1.0.0.1 - 1.0.0.1
environment: environment:
MYSQL_HOSTNAME: mysql POSTGRES_HOSTNAME: postgres
MYSQL_DATABASE: guacamole_db POSTGRES_DATABASE: guacamole_db
MYSQL_USER: guacamole_user POSTGRES_USER: guacamole_user
MYSQL_PASSWORD: ${DB_USER_PASS} POSTGRES_PASSWORD: ${DB_USER_PASS}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
{{- if .Values.HOST_LABEL}} {{- if .Values.HOST_LABEL}}
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
{{- end}} {{- end}}
{{- if .Values.TRAEFIK_HOST}}
traefik.enable: true traefik.enable: true
### Start Web Segment ### Start Web Segment
traefik.web.frontend.entryPoints: http,https traefik.web.frontend.entryPoints: http,https
traefik.web.frontend.headers.forceSTSHeader: true traefik.web.frontend.headers.forceSTSHeader: true
traefik.web.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information)
traefik.web.frontend.headers.SSLRedirect: true traefik.web.frontend.headers.SSLRedirect: true
traefik.web.frontend.headers.STSPreload: true traefik.web.frontend.headers.STSPreload: true
traefik.web.frontend.headers.STSSeconds: 15552000 traefik.web.frontend.headers.STSSeconds: 15552000
traefik.web.frontend.redirect.entryPoint: https
traefik.web.frontend.redirect.permanent: true
traefik.web.frontend.rule: Host:${TRAEFIK_HOST} traefik.web.frontend.rule: Host:${TRAEFIK_HOST}
traefik.web.port: "8080" traefik.web.port: "8080"
### End Web Segment ### End Web Segment
{{- else}}
traefik.enable: false
{{- end}}
links: links:
- guacd - guacd
- mysql - postgres
networks:
- public-proxy
ports:
- "${WEB_PORT}:8080"
restart: on-failure restart: on-failure
volumes:
- /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
- /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
guacd: guacd:
image: guacamole/guacd:latest image: guacamole/guacd:latest
dns: dns:
@@ -50,34 +44,29 @@ services:
{{- if .Values.HOST_LABEL}} {{- if .Values.HOST_LABEL}}
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
{{- end}} {{- end}}
traefik.enable: false
restart: on-failure restart: on-failure
mysql: volumes:
image: mysql:latest - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
- /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
postgres:
image: postgres:alpine
dns: dns:
- 1.1.1.1 - 1.1.1.1
- 1.0.0.1 - 1.0.0.1
environment: environment:
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} POSTGRES_DB: guacamole_db
MYSQL_DATABASE: guacamole_db POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS}
MYSQL_USER: guacamole_user POSTGRES_USER: guacamole_user
MYSQL_PASSWORD: ${DB_USER_PASS} POSTGRES_PASSWORD: ${DB_USER_PASS}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
{{- if .Values.HOST_LABEL}} {{- if .Values.HOST_LABEL}}
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
{{- end}} {{- end}}
networks: traefik.enable: false
db-admin:
aliases:
- guacamole
restart: on-failure restart: on-failure
volumes: volumes:
- /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
- /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
- /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql # MySQL Database to be persistent - /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data
networks:
db-admin:
external: true
public-proxy:
external: true