From e99b0be5f38515ee1555b1ea7c2e43037467f866 Mon Sep 17 00:00:00 2001 From: WilliamMiceli <9000802+WilliamMiceli@users.noreply.github.com> Date: Wed, 29 Aug 2018 13:53:08 -0400 Subject: [PATCH] Testing with different nginx.conf --- templates/InvoiceNinja/0/docker-compose.yml | 22 +++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/templates/InvoiceNinja/0/docker-compose.yml b/templates/InvoiceNinja/0/docker-compose.yml index e504063..8e3dcd5 100644 --- a/templates/InvoiceNinja/0/docker-compose.yml +++ b/templates/InvoiceNinja/0/docker-compose.yml @@ -22,27 +22,14 @@ services: {{- if (.Values.GMAPS_KEY)}} GOOGLE_MAPS_API_KEY: ${GMAPS_KEY} {{- end}} - expose: - - "9000" labels: io.rancher.container.pull_image: always {{- if (.Values.HOST_LABEL)}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} io.rancher.sidekicks: cron, web - {{- if .Values.TRAEFIK_HOST}} - traefik.enable: true - traefik.frontend.rule: Host:${TRAEFIK_HOST} - traefik.port: "9000" - traefik.frontend.entryPoints: https - traefik.frontend.passHostHeader: true - {{- else}} - traefik.enable: false - {{- end}} links: - mysql - networks: - - public-proxy restart: on-failure volumes: - Logo:/var/www/app/public/logo @@ -117,6 +104,15 @@ services: {{- if .Values.HOST_LABEL}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} + {{- if .Values.TRAEFIK_HOST}} + traefik.enable: true + traefik.frontend.rule: Host:${TRAEFIK_HOST} + traefik.port: "80" + traefik.frontend.entryPoints: https + traefik.frontend.passHostHeader: true + {{- else}} + traefik.enable: false + {{- end}} links: - app networks: