diff --git a/templates/Gogs/0/docker-compose.yml b/templates/Gogs/0/docker-compose.yml index 7f454b1..a4ef702 100644 --- a/templates/Gogs/0/docker-compose.yml +++ b/templates/Gogs/0/docker-compose.yml @@ -14,16 +14,15 @@ 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 - traefik.ssh.frontend.headers.forceSTSHeader: true - traefik.ssh.frontend.headers.SSLRedirect: true - traefik.ssh.frontend.headers.STSPreload: true - traefik.ssh.frontend.headers.STSSeconds: 15552000 - traefik.ssh.frontend.rule: Host:${TRAEFIK_HOST} - traefik.ssh.port: "22" + # traefik.ssh.frontend.entryPoints: ssh + # traefik.ssh.frontend.headers.forceSTSHeader: true + # traefik.ssh.frontend.headers.SSLRedirect: true + # traefik.ssh.frontend.headers.STSPreload: true + # traefik.ssh.frontend.headers.STSSeconds: 15552000 + # traefik.ssh.frontend.rule: Host:${TRAEFIK_HOST} + # traefik.ssh.port: "22" ### End SSH Segment ### Start Web Segment traefik.web.frontend.entryPoints: http,https @@ -34,16 +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 - ports: - - "${SSH_PORT}:22" - - "${WEB_PORT}:3000" restart: on-failure volumes: - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system @@ -55,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} @@ -64,18 +55,8 @@ services: {{- if .Values.HOST_LABEL}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} - networks: - db-admin: - aliases: - - gogs 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 diff --git a/templates/Gogs/0/rancher-compose.yml b/templates/Gogs/0/rancher-compose.yml index 8bb1d55..30d86f8 100644 --- a/templates/Gogs/0/rancher-compose.yml +++ b/templates/Gogs/0/rancher-compose.yml @@ -20,24 +20,7 @@ catalog: label: "Public Host Domain" description: | The host that Traefik will use to provide public access. - Leaving this empty will disable Traefik on this stack. default: "subdomain.domain.tld" - required: false - type: string - - - variable: "WEB_PORT" - label: "Local Web Port" - description: | - The port to locally access the web interface on. - default: "10500" - required: true - type: string - - - variable: "SSH_PORT" - label: "SSH Port" - description: | - The port to access the SSH server on. - default: "1022" required: true type: string @@ -63,10 +46,4 @@ catalog: The directory to store persistent data for the stack. default: "Personal/Gogs" required: true - type: string - -services: - gogs: - scale: 1 - mysql: - scale: 1 \ No newline at end of file + type: string \ No newline at end of file