From 60f5ba6bda50dda46eaf1a39db650c1abd1def07 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 12 Jan 2019 19:55:02 -0500
Subject: [PATCH] Removed networks, ports, disabling traefik

---
 templates/Snipe-IT/0/docker-compose.yml  | 33 ++----------------------
 templates/Snipe-IT/0/rancher-compose.yml | 12 +--------
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/templates/Snipe-IT/0/docker-compose.yml b/templates/Snipe-IT/0/docker-compose.yml
index abae525..d741bc7 100644
--- a/templates/Snipe-IT/0/docker-compose.yml
+++ b/templates/Snipe-IT/0/docker-compose.yml
@@ -3,19 +3,13 @@ services:
 
   snipe-it:
     image: snipe/snipe-it:latest
-    depends_on:
-      - mysql
     dns:
       - 1.1.1.1
       - 1.0.0.1
     environment:
-      APP_ENV: production # "development" or "production"
+      APP_ENV: production # [ development | production ]
       APP_DEBUG: false
-      {{- if .Values.TRAEFIK_HOST}}
       APP_URL: https://${TRAEFIK_HOST} # No port number needed
-      {{- else}}
-      APP_URL: http://localhost
-      {{- end}}
       APP_KEY: ${APP_KEY}
       MYSQL_HOST: mysql
       MYSQL_DATABASE: snipeit_db
@@ -26,7 +20,6 @@ services:
       {{- if .Values.HOST_LABEL}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
-      {{- if .Values.TRAEFIK_HOST}}
       traefik.enable: true
       ### Start Web Segment
       traefik.web.frontend.entryPoints: http,https
@@ -37,20 +30,8 @@ services:
       traefik.web.frontend.rule: Host:${TRAEFIK_HOST}
       traefik.web.port: "80"
       ### End Web Segment
-      {{- else}}
-      traefik.enable: false
-      {{- end}}
     links:
       - mysql
-    networks:
-      - public-proxy
-    {{- if .Values.WEB_PORT}} # Allows for local access to be disabled
-    ports:
-      - "${WEB_PORT}:80"
-    {{- else}}
-    expose:
-      - "80"
-    {{- end}}
     restart: on-failure
     volumes:
       - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
@@ -72,18 +53,8 @@ services:
       {{- if (.Values.HOST_LABEL)}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
-    networks:
-      db-admin:
-        aliases:
-          - snipe-it # This should allow access from "mysql.snipe-it.rancher.internal"
     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
-      - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql
-
-networks:
-  db-admin:
-    external: true
-  public-proxy:
-    external: true
\ No newline at end of file
+      - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql
\ No newline at end of file
diff --git a/templates/Snipe-IT/0/rancher-compose.yml b/templates/Snipe-IT/0/rancher-compose.yml
index 9b8ec41..a6a9136 100644
--- a/templates/Snipe-IT/0/rancher-compose.yml
+++ b/templates/Snipe-IT/0/rancher-compose.yml
@@ -20,18 +20,8 @@ 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.
-        Leaving this empty will not expose a any port on the host system, disabling local access outside of it's Rancher network.
-      default: "10300"
-      required: false
+      required: true
       type: string
 
     - variable: "DATA_DIR"