diff --git a/templates/SnipeIT/0/docker-compose.yml b/templates/SnipeIT/0/docker-compose.yml index dc962c1..ee4aa0a 100644 --- a/templates/SnipeIT/0/docker-compose.yml +++ b/templates/SnipeIT/0/docker-compose.yml @@ -9,9 +9,9 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - APP_ENV: production + # APP_ENV: production APP_DEBUG: true - APP_URL: ${URL}:${HOST_HTTP_PORT} + APP_URL: ${URL}:${WEB_PORT} APP_KEY: ${APP_KEY} MYSQL_HOST: mysql MYSQL_DATABASE: snipeit @@ -20,18 +20,16 @@ services: APP_ENV: labels: io.rancher.container.pull_image: always - {{- if (.Values.HOST_LABEL)}} + {{- if .Values.HOST_LABEL}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} - networks: - - default - - snipe-net + links: + - mysql ports: - - "${HOST_HTTP_PORT}:80" - - "${HOST_HTTPS_PORT}:443" + - "${WEB_PORT}:80" restart: on-failure volumes: - - ${STORAGE_BASE_DIR}${APP_DIR}:/var/lib/snipeit + - /RancherCattleData/${DATA_DIR}/Application:/var/lib/snipeit mysql: image: mysql:5 dns: @@ -47,11 +45,6 @@ services: {{- if (.Values.HOST_LABEL)}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} - networks: - - snipe-net restart: on-failure volumes: - - ${STORAGE_BASE_DIR}${DB_DIR}:/var/lib/mysql - -networks: - snipe-net: \ No newline at end of file + - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql \ No newline at end of file diff --git a/templates/SnipeIT/0/rancher-compose.yml b/templates/SnipeIT/0/rancher-compose.yml index 9326ac1..e4d0e0c 100644 --- a/templates/SnipeIT/0/rancher-compose.yml +++ b/templates/SnipeIT/0/rancher-compose.yml @@ -11,7 +11,7 @@ catalog: - variable: "HOST_LABEL" label: "Host Label Key/Value Pair" description: | - The Label Key/Value pair on the host which InvoiceNinja should be deployed + The Label Key/Value pair on the host which containers should be deployed default: "host.id=Host1" required: false type: string @@ -24,43 +24,19 @@ catalog: required: true type: string - - variable: "HOST_HTTP_PORT" - label: "Host HTTP Port" + - variable: "WEB_PORT" + label: "Local Web Port" description: | - The HTTP port to access the web interface on. - default: "12000" + The port to locally access the web interface on. + default: "10300" required: true type: string - - variable: "HOST_HTTPS_PORT" - label: "Host HTTPS Port" + - variable: "DATA_DIR" + label: "Data Directory" description: | - The HTTPS port to access the web interface on. - default: "12500" - required: true - type: string - - - variable: "STORAGE_BASE_DIR" - label: "Base Storage Directory" - description: | - The base path of where persistent storage should be kept at. - default: "/RancherStorage/SnipeIT" - required: true - type: string - - - variable: "APP_DIR" - label: "Application Directory" - description: | - The folder for persistent application files. - default: "/Application" - required: true - type: string - - - variable: "DB_DIR" - label: "Database Directory" - description: | - The folder for persistent database files. - default: "/Database" + The directory to store persistent data for the stack. + default: "Personal/Snipe-IT" required: true type: string @@ -68,6 +44,7 @@ catalog: label: "MySQL Root Password" description: | A secure password to be used by the "root" MySQL user. + # default: required: true type: password @@ -75,6 +52,7 @@ catalog: label: "MySQL User Password" description: | A secure password to be used by the "snipe_user" MySQL user. + # default: required: true type: password