Removed networks, as Rancher doesn't use them, and Traefik is now mandatory

This commit is contained in:
William Miceli
2019-02-06 20:23:44 -05:00
parent 9be1a07b8c
commit ab5ea9210c

View File

@@ -14,7 +14,6 @@ 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}}
{{- if .Values.TRAEFIK_HOST}}
traefik.enable: true traefik.enable: true
### Start SSH Segment ### Start SSH Segment
# traefik.ssh.frontend.entryPoints: ssh # traefik.ssh.frontend.entryPoints: ssh
@@ -34,13 +33,8 @@ services:
traefik.web.frontend.rule: Host:${TRAEFIK_HOST} traefik.web.frontend.rule: Host:${TRAEFIK_HOST}
traefik.web.port: "3000" traefik.web.port: "3000"
### End Web Segment ### End Web Segment
{{- else}}
traefik.enable: false
{{- end}}
links: links:
- mysql - mysql
networks:
- public-proxy
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
@@ -52,7 +46,7 @@ services:
- 1.1.1.1 - 1.1.1.1
- 1.0.0.1 - 1.0.0.1
environment: environment:
MYSQL_DATABASE: gogs # Will eventually rename this to "gogs_db" MYSQL_DATABASE: gogs_db
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
MYSQL_USER: gogs_user MYSQL_USER: gogs_user
MYSQL_PASSWORD: ${DB_USER_PASS} MYSQL_PASSWORD: ${DB_USER_PASS}
@@ -61,18 +55,8 @@ 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}}
networks:
db-admin:
aliases:
- gogs-db
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
- /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql
networks:
db-admin:
external: true
public-proxy:
external: true