From ab5ea9210c74f488de60da393b78148a2e67ec56 Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@users.noreply.git.williammiceli.systems> Date: Wed, 6 Feb 2019 20:23:44 -0500 Subject: [PATCH] Removed networks, as Rancher doesn't use them, and Traefik is now mandatory --- templates/Gogs/0/docker-compose.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/templates/Gogs/0/docker-compose.yml b/templates/Gogs/0/docker-compose.yml index 96029a6..a4ef702 100644 --- a/templates/Gogs/0/docker-compose.yml +++ b/templates/Gogs/0/docker-compose.yml @@ -14,7 +14,6 @@ services: {{- if .Values.HOST_LABEL}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} - {{- if .Values.TRAEFIK_HOST}} traefik.enable: true ### Start SSH Segment # traefik.ssh.frontend.entryPoints: ssh @@ -34,13 +33,8 @@ services: traefik.web.frontend.rule: Host:${TRAEFIK_HOST} traefik.web.port: "3000" ### End Web Segment - {{- else}} - traefik.enable: false - {{- end}} links: - mysql - networks: - - public-proxy restart: on-failure volumes: - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system @@ -52,7 +46,7 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - MYSQL_DATABASE: gogs # Will eventually rename this to "gogs_db" + MYSQL_DATABASE: gogs_db MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} MYSQL_USER: gogs_user MYSQL_PASSWORD: ${DB_USER_PASS} @@ -61,18 +55,8 @@ services: {{- if .Values.HOST_LABEL}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} - networks: - db-admin: - aliases: - - gogs-db 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 - - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql - -networks: - db-admin: - external: true - public-proxy: - external: true \ No newline at end of file + - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql \ No newline at end of file