From 86948b6488a71af625926280b28badbde6396f65 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 7 Dec 2018 14:26:10 -0500 Subject: [PATCH 01/28] Will continue in the future --- templates/Matomo/0/README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 templates/Matomo/0/README.md diff --git a/templates/Matomo/0/README.md b/templates/Matomo/0/README.md new file mode 100644 index 0000000..7a4646f --- /dev/null +++ b/templates/Matomo/0/README.md @@ -0,0 +1,5 @@ +# Matomo (formerly Piwik) + +### Will continue this in the future + +https://store.docker.com/_/matomo \ No newline at end of file From ff5e37260624541a17257060325131ce6fed81ad Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 7 Dec 2018 15:00:34 -0500 Subject: [PATCH 02/28] Will work on later --- templates/Yourls/0/README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 templates/Yourls/0/README.md diff --git a/templates/Yourls/0/README.md b/templates/Yourls/0/README.md new file mode 100644 index 0000000..f7fa70a --- /dev/null +++ b/templates/Yourls/0/README.md @@ -0,0 +1,5 @@ +# YOURLS (Your Own URL Shortener) + +### Will continue this later + +https://store.docker.com/_/yourls \ No newline at end of file From a4c5a4520267689fdb250888e70a216fcfa0e954 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 14:41:47 -0500 Subject: [PATCH 03/28] First test configuration --- templates/Pydio-Cells/0/README.md | 1 + templates/Pydio-Cells/0/docker-compose.yml | 59 +++++++++++++++++++++ templates/Pydio-Cells/0/rancher-compose.yml | 49 +++++++++++++++++ templates/Pydio-Cells/config.yml | 8 +++ 4 files changed, 117 insertions(+) create mode 100644 templates/Pydio-Cells/0/README.md create mode 100644 templates/Pydio-Cells/0/docker-compose.yml create mode 100644 templates/Pydio-Cells/0/rancher-compose.yml create mode 100644 templates/Pydio-Cells/config.yml diff --git a/templates/Pydio-Cells/0/README.md b/templates/Pydio-Cells/0/README.md new file mode 100644 index 0000000..4eeb58c --- /dev/null +++ b/templates/Pydio-Cells/0/README.md @@ -0,0 +1 @@ +# Pydio Cells \ No newline at end of file diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml new file mode 100644 index 0000000..a55d97b --- /dev/null +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -0,0 +1,59 @@ +version: '2' + +services: + cells: + image: pydio/cells:latest + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + environment: + CELLS_BIND: localhost:80 + CELLS_EXTERNAL: ${TRAEFIK_HOST} + CELLS_NO_SSL: true + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: true + ### Start Web Segment + traefik.web.frontend.entryPoints: http,https + traefik.web.frontend.headers.forceSTSHeader: true + traefik.web.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) + traefik.web.frontend.headers.SSLRedirect: true + traefik.web.frontend.headers.STSPreload: true + traefik.web.frontend.headers.STSSeconds: 15552000 + traefik.web.frontend.rule: Host:${TRAEFIK_HOST} + traefik.web.port: "80" + ### End Web Segment + links: + - mysql + 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}/Configuration/pydio.json:/root/.config/pydio/cells/pydio.json # Cells main configuration file + - /RancherCattle/${DATA_DIR}/Data:/root/.config/pydio/cells/data # Cells users' data files + - /RancherCattle/${DATA_DIR}/Logs:/root/.config/pydio/cells/logs # Cells logs + - /RancherCattle/${DATA_DIR}/Services:/root/.config/pydio/cells/services # Cells services information + mysql: + image: mysql:5 + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + environment: + MYSQL_DATABASE: cells_db + MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} + MYSQL_USER: cells_user + MYSQL_PASSWORD: ${DB_USER_PASS} + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: false + 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 diff --git a/templates/Pydio-Cells/0/rancher-compose.yml b/templates/Pydio-Cells/0/rancher-compose.yml new file mode 100644 index 0000000..0656229 --- /dev/null +++ b/templates/Pydio-Cells/0/rancher-compose.yml @@ -0,0 +1,49 @@ +version: '2' +catalog: + name: Pydio Cells + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Label Key/Value pair on the host which containers should be deployed + default: "host.id=Host1" + required: false + type: string + + - variable: "TRAEFIK_HOST" + label: "Public Host Domain" + description: | + The host that Traefik will use to provide public access. + default: "subdomain.domain.tld" + required: true + type: string + + - variable: "DB_ROOT_PASS" + label: "Database Root Password" + description: | + A secure password to be used by the "root" database user. + # default: + required: true + type: password + + - variable: "DB_USER_PASS" + label: "Database User Password" + description: | + A secure password to be used by the "cells_user" database user. + # default: + required: true + type: password + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/Pydio-Cells" + required: true + type: string \ No newline at end of file diff --git a/templates/Pydio-Cells/config.yml b/templates/Pydio-Cells/config.yml new file mode 100644 index 0000000..cf045cd --- /dev/null +++ b/templates/Pydio-Cells/config.yml @@ -0,0 +1,8 @@ +name: Pydio Cells +description: | + Status: EXPERIMENTAL +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From e72ea3535a6144b30a337f171d5379343cdc5f11 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 15:03:10 -0500 Subject: [PATCH 04/28] Trying without mounting file directly --- templates/Pydio-Cells/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index a55d97b..992f32d 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -32,7 +32,7 @@ services: 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}/Configuration/pydio.json:/root/.config/pydio/cells/pydio.json # Cells main configuration file + - /RancherCattle/${DATA_DIR}/Configuration:/root/.config/pydio/cells # Cells main configuration - /RancherCattle/${DATA_DIR}/Data:/root/.config/pydio/cells/data # Cells users' data files - /RancherCattle/${DATA_DIR}/Logs:/root/.config/pydio/cells/logs # Cells logs - /RancherCattle/${DATA_DIR}/Services:/root/.config/pydio/cells/services # Cells services information From 6790a075556cbc81411d0507c9d4735fe828a706 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 15:15:01 -0500 Subject: [PATCH 05/28] Changed environment variable value --- templates/Pydio-Cells/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index 992f32d..1923879 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -9,7 +9,7 @@ services: environment: CELLS_BIND: localhost:80 CELLS_EXTERNAL: ${TRAEFIK_HOST} - CELLS_NO_SSL: true + CELLS_NO_SSL: 1 labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} From aa0582b6c9dcebec8d00f3901da1e5ba8b1338ae Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 15:23:58 -0500 Subject: [PATCH 06/28] This thing is a bit finicky.... --- templates/Pydio-Cells/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index 1923879..d3d7d5d 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -7,7 +7,7 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - CELLS_BIND: localhost:80 + CELLS_BIND: ${TRAEFIK_HOST}:80 CELLS_EXTERNAL: ${TRAEFIK_HOST} CELLS_NO_SSL: 1 labels: From 427d2bea64ac835c546a9960f1cd633d97e79f1b Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 15:55:23 -0500 Subject: [PATCH 07/28] Toggled SSL --- templates/Pydio-Cells/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index d3d7d5d..7d9a8bb 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -9,7 +9,7 @@ services: environment: CELLS_BIND: ${TRAEFIK_HOST}:80 CELLS_EXTERNAL: ${TRAEFIK_HOST} - CELLS_NO_SSL: 1 + CELLS_NO_SSL: 0 labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} From b284a5689e213aedb4d2d501b1e272e3caf4c9f6 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:01:16 -0500 Subject: [PATCH 08/28] Condensed volumes --- templates/Pydio-Cells/0/docker-compose.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index 7d9a8bb..a94b422 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -32,10 +32,7 @@ services: 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}/Configuration:/root/.config/pydio/cells # Cells main configuration - - /RancherCattle/${DATA_DIR}/Data:/root/.config/pydio/cells/data # Cells users' data files - - /RancherCattle/${DATA_DIR}/Logs:/root/.config/pydio/cells/logs # Cells logs - - /RancherCattle/${DATA_DIR}/Services:/root/.config/pydio/cells/services # Cells services information + - /RancherCattle/${DATA_DIR}:/root/.config/pydio/cells # Cells data mysql: image: mysql:5 dns: # Using Cloudflare DNS From 3a1a097fdabdd99654ab5d9e756f23fc7f52039b Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:08:01 -0500 Subject: [PATCH 09/28] Revert "Condensed volumes", also added port to CELLS_EXTERNAL This reverts commit b284a5689e213aedb4d2d501b1e272e3caf4c9f6. --- templates/Pydio-Cells/0/docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index a94b422..1e64d4b 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -8,7 +8,7 @@ services: - 1.0.0.1 environment: CELLS_BIND: ${TRAEFIK_HOST}:80 - CELLS_EXTERNAL: ${TRAEFIK_HOST} + CELLS_EXTERNAL: ${TRAEFIK_HOST}:443 CELLS_NO_SSL: 0 labels: io.rancher.container.pull_image: always @@ -32,7 +32,9 @@ services: 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}:/root/.config/pydio/cells # Cells data + - /RancherCattle/${DATA_DIR}/Data:/root/.config/pydio/cells/data # Cells users' data files + - /RancherCattle/${DATA_DIR}/Logs:/root/.config/pydio/cells/logs # Cells logs + - /RancherCattle/${DATA_DIR}/Services:/root/.config/pydio/cells/services # Cells services information mysql: image: mysql:5 dns: # Using Cloudflare DNS From e7c9fd5301bec25186b5298137dd1687f04abf79 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:14:23 -0500 Subject: [PATCH 10/28] Updated README: Cells is UNSTABLE --- templates/Pydio-Cells/0/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/Pydio-Cells/0/README.md b/templates/Pydio-Cells/0/README.md index 4eeb58c..a29f50f 100644 --- a/templates/Pydio-Cells/0/README.md +++ b/templates/Pydio-Cells/0/README.md @@ -1 +1,6 @@ -# Pydio Cells \ No newline at end of file +# Pydio Cells + +As of 2019/01/22: +Cells seems UNSTABLE +Was only able to get it started once, but didn't even make it all the way through installing. +Will probably come back to this at a later date, once they've worked out all the issues. \ No newline at end of file From 3dc3e73b40283de913570998739e18eb4551acf0 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:30:49 -0500 Subject: [PATCH 11/28] Initial test configuration; folder fix 1/2 --- templates/YOURLS1/0/README.md | 5 +++ templates/YOURLS1/0/docker-compose.yml | 57 +++++++++++++++++++++++++ templates/YOURLS1/0/rancher-compose.yml | 49 +++++++++++++++++++++ templates/YOURLS1/config.yml | 8 ++++ templates/Yourls/0/README.md | 5 --- 5 files changed, 119 insertions(+), 5 deletions(-) create mode 100644 templates/YOURLS1/0/README.md create mode 100644 templates/YOURLS1/0/docker-compose.yml create mode 100644 templates/YOURLS1/0/rancher-compose.yml create mode 100644 templates/YOURLS1/config.yml delete mode 100644 templates/Yourls/0/README.md diff --git a/templates/YOURLS1/0/README.md b/templates/YOURLS1/0/README.md new file mode 100644 index 0000000..e762fd6 --- /dev/null +++ b/templates/YOURLS1/0/README.md @@ -0,0 +1,5 @@ +# YOURLS + +## Pre-Requisites + +* Traefik deployed \ No newline at end of file diff --git a/templates/YOURLS1/0/docker-compose.yml b/templates/YOURLS1/0/docker-compose.yml new file mode 100644 index 0000000..5da535f --- /dev/null +++ b/templates/YOURLS1/0/docker-compose.yml @@ -0,0 +1,57 @@ +version: '2' + +services: + yourls: + image: yourls:apache + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + environment: + YOURLS_DB_HOST: mysql + YOURLS_DB_NAME: yourls_db + YOURLS_DB_USER: yourls_user + YOURLS_DB_PASS: ${DB_USER_PASS} + YOURLS_SITE: ${TRAEFIK_HOST} + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: true + ### Start Web Segment + traefik.web.frontend.entryPoints: http,https + traefik.web.frontend.headers.forceSTSHeader: true + traefik.web.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) + traefik.web.frontend.headers.SSLRedirect: true + traefik.web.frontend.headers.STSPreload: true + traefik.web.frontend.headers.STSSeconds: 15552000 + traefik.web.frontend.rule: Host:${TRAEFIK_HOST} + traefik.web.port: "80" + ### End Web Segment + links: + - mysql + 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 + mysql: + image: mysql:5 + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + environment: + MYSQL_DATABASE: yourls_db + MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} + MYSQL_USER: yourls_user + MYSQL_PASSWORD: ${DB_USER_PASS} + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: false + 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 diff --git a/templates/YOURLS1/0/rancher-compose.yml b/templates/YOURLS1/0/rancher-compose.yml new file mode 100644 index 0000000..d5e9278 --- /dev/null +++ b/templates/YOURLS1/0/rancher-compose.yml @@ -0,0 +1,49 @@ +version: '2' +catalog: + name: YOURLS + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Label Key/Value pair on the host which containers should be deployed + default: "host.id=Host1" + required: false + type: string + + - variable: "TRAEFIK_HOST" + label: "Public Host Domain" + description: | + The host that Traefik will use to provide public access. + default: "subdomain.domain.tld" + required: true + type: string + + - variable: "DB_ROOT_PASS" + label: "Database Root Password" + description: | + A secure password to be used by the "root" database user. + # default: + required: true + type: password + + - variable: "DB_USER_PASS" + label: "Database User Password" + description: | + A secure password to be used by the "yourls_user" database user. + # default: + required: true + type: password + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/YOURLS" + required: true + type: string \ No newline at end of file diff --git a/templates/YOURLS1/config.yml b/templates/YOURLS1/config.yml new file mode 100644 index 0000000..1a4dafd --- /dev/null +++ b/templates/YOURLS1/config.yml @@ -0,0 +1,8 @@ +name: YOURLS +description: | + Status: EXPERIMENTAL +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file diff --git a/templates/Yourls/0/README.md b/templates/Yourls/0/README.md deleted file mode 100644 index f7fa70a..0000000 --- a/templates/Yourls/0/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# YOURLS (Your Own URL Shortener) - -### Will continue this later - -https://store.docker.com/_/yourls \ No newline at end of file From ffc3023ac431b8db1abf563e1c821bf73bce6b02 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:31:25 -0500 Subject: [PATCH 12/28] Folder fix 2/2 --- templates/{YOURLS1 => YOURLS}/0/README.md | 0 templates/{YOURLS1 => YOURLS}/0/docker-compose.yml | 0 templates/{YOURLS1 => YOURLS}/0/rancher-compose.yml | 0 templates/{YOURLS1 => YOURLS}/config.yml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename templates/{YOURLS1 => YOURLS}/0/README.md (100%) rename templates/{YOURLS1 => YOURLS}/0/docker-compose.yml (100%) rename templates/{YOURLS1 => YOURLS}/0/rancher-compose.yml (100%) rename templates/{YOURLS1 => YOURLS}/config.yml (100%) diff --git a/templates/YOURLS1/0/README.md b/templates/YOURLS/0/README.md similarity index 100% rename from templates/YOURLS1/0/README.md rename to templates/YOURLS/0/README.md diff --git a/templates/YOURLS1/0/docker-compose.yml b/templates/YOURLS/0/docker-compose.yml similarity index 100% rename from templates/YOURLS1/0/docker-compose.yml rename to templates/YOURLS/0/docker-compose.yml diff --git a/templates/YOURLS1/0/rancher-compose.yml b/templates/YOURLS/0/rancher-compose.yml similarity index 100% rename from templates/YOURLS1/0/rancher-compose.yml rename to templates/YOURLS/0/rancher-compose.yml diff --git a/templates/YOURLS1/config.yml b/templates/YOURLS/config.yml similarity index 100% rename from templates/YOURLS1/config.yml rename to templates/YOURLS/config.yml From 65e0e4a67027fc6839fa40b087e4cc161e59ffc8 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:39:57 -0500 Subject: [PATCH 13/28] Testing with SSL protocol --- templates/YOURLS/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/YOURLS/0/docker-compose.yml b/templates/YOURLS/0/docker-compose.yml index 5da535f..0fbdb04 100644 --- a/templates/YOURLS/0/docker-compose.yml +++ b/templates/YOURLS/0/docker-compose.yml @@ -11,7 +11,7 @@ services: YOURLS_DB_NAME: yourls_db YOURLS_DB_USER: yourls_user YOURLS_DB_PASS: ${DB_USER_PASS} - YOURLS_SITE: ${TRAEFIK_HOST} + YOURLS_SITE: https://${TRAEFIK_HOST} labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} From fd77e21d2b0b34d1eb312738ed5b23c217e83c37 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 6 Feb 2019 22:05:02 -0500 Subject: [PATCH 14/28] Created folder --- templates/Grav/0/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 templates/Grav/0/README.md diff --git a/templates/Grav/0/README.md b/templates/Grav/0/README.md new file mode 100644 index 0000000..23ce3c5 --- /dev/null +++ b/templates/Grav/0/README.md @@ -0,0 +1 @@ +# Grav \ No newline at end of file From 04a449f373771a5c0d77a85d8d95a6f964a1df9c Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 8 Feb 2019 23:48:13 -0500 Subject: [PATCH 15/28] WIP: Added most needed elements --- templates/Matomo/0/README.md | 6 +--- templates/Matomo/0/docker-compose.yml | 25 +++++++++++++ templates/Matomo/0/rancher-compose.yml | 49 ++++++++++++++++++++++++++ templates/Matomo/config.yml | 8 +++++ 4 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 templates/Matomo/0/docker-compose.yml create mode 100644 templates/Matomo/0/rancher-compose.yml create mode 100644 templates/Matomo/config.yml diff --git a/templates/Matomo/0/README.md b/templates/Matomo/0/README.md index 7a4646f..5b5a6d1 100644 --- a/templates/Matomo/0/README.md +++ b/templates/Matomo/0/README.md @@ -1,5 +1 @@ -# Matomo (formerly Piwik) - -### Will continue this in the future - -https://store.docker.com/_/matomo \ No newline at end of file +# Matomo \ No newline at end of file diff --git a/templates/Matomo/0/docker-compose.yml b/templates/Matomo/0/docker-compose.yml new file mode 100644 index 0000000..35751a4 --- /dev/null +++ b/templates/Matomo/0/docker-compose.yml @@ -0,0 +1,25 @@ +version: "2" + +services: + matomo: + image: matomo:3.5-apache + restart: always + links: + - db + volumes: + - "./config:/var/www/html/config:rw" + - "./logs:/var/www/html/logs" + environment: + VIRTUAL_HOST: CHANGE_ME + ports: + - "80:80" + + db: + image: mariadb:latest + volumes: + - ./mysql/runtime2:/var/lib/mysql + environment: + MYSQL_DATABASE: matomo_db + MYSQL_ROOT_PASSWORD: CHANGE_ME + MYSQL_USER: matomo_user + MYSQL_PASSWORD: CHANGE_ME \ No newline at end of file diff --git a/templates/Matomo/0/rancher-compose.yml b/templates/Matomo/0/rancher-compose.yml new file mode 100644 index 0000000..4b547a8 --- /dev/null +++ b/templates/Matomo/0/rancher-compose.yml @@ -0,0 +1,49 @@ +version: '2' +catalog: + name: Matomo + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Label Key/Value pair of the host which containers should be deployed + default: "host.id=Host1" + required: false + type: string + + - variable: "TRAEFIK_HOST" + label: "Public Host Domain" + description: | + The host that Traefik will use to provide public access. + default: "subdomain.domain.tld" + required: true + type: string + + - variable: "DB_ROOT_PASS" + label: "Database Root Password" + description: | + A secure password to be used by the "root" database user. + # default: + required: true + type: password + + - variable: "DB_USER_PASS" + label: "Database User Password" + description: | + A secure password to be used by the "matomo_user" database user. + # default: + required: true + type: password + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/Matomo" + required: true + type: string \ No newline at end of file diff --git a/templates/Matomo/config.yml b/templates/Matomo/config.yml new file mode 100644 index 0000000..e21b6da --- /dev/null +++ b/templates/Matomo/config.yml @@ -0,0 +1,8 @@ +name: Matomo +description: | + Status: NOT READY +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From 618cd26242b93e510d3ed2b8b8a3cf0c70ed575d Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 9 Feb 2019 12:32:26 -0500 Subject: [PATCH 16/28] WIP: Most elements added --- templates/Mongo/0/README.md | 5 +++ templates/Mongo/0/docker-compose.yml | 34 ++++++++++++++++++++ templates/Mongo/0/rancher-compose.yml | 45 +++++++++++++++++++++++++++ templates/Mongo/config.yml | 8 +++++ 4 files changed, 92 insertions(+) create mode 100644 templates/Mongo/0/README.md create mode 100644 templates/Mongo/0/docker-compose.yml create mode 100644 templates/Mongo/0/rancher-compose.yml create mode 100644 templates/Mongo/config.yml diff --git a/templates/Mongo/0/README.md b/templates/Mongo/0/README.md new file mode 100644 index 0000000..5ae3faf --- /dev/null +++ b/templates/Mongo/0/README.md @@ -0,0 +1,5 @@ +# Redis + +### Will continue this in the future + +https://store.docker.com/_/redis \ No newline at end of file diff --git a/templates/Mongo/0/docker-compose.yml b/templates/Mongo/0/docker-compose.yml new file mode 100644 index 0000000..171eb30 --- /dev/null +++ b/templates/Mongo/0/docker-compose.yml @@ -0,0 +1,34 @@ +version: '2' + +services: + mongo: + image: mongo:${IMAGE_TAG} + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: false + restart: on-failure + stdin_open: true + tty: true + 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 + {{- if .Values.DATA_DIR}} + {{- if eq .Values.CUSTOM_CONF "true"}} + - /RancherCattle/${DATA_DIR}/Configuration:/etc/mongo + {{- end}} + - /RancherCattle/${DATA_DIR}/Data:/data/db + {{- end}} + mongo-express: + image: mongo-express + restart: always + ports: + - 8081:8081 + environment: + ME_CONFIG_MONGODB_ADMINUSERNAME: root + ME_CONFIG_MONGODB_ADMINPASSWORD: example \ No newline at end of file diff --git a/templates/Mongo/0/rancher-compose.yml b/templates/Mongo/0/rancher-compose.yml new file mode 100644 index 0000000..0c24d37 --- /dev/null +++ b/templates/Mongo/0/rancher-compose.yml @@ -0,0 +1,45 @@ +version: '2' +catalog: + name: Mongo + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + # uuid: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Key/Value pair on the host which the stack should be deployed. + default: "host.id=Host1" + required: false + type: string + + - variable: "IMAGE_TAG" + label: "Image Tag" + description: | + The image tag to use for the desired container variant. + default: "latest" + required: true + type: enum + options: + - "latest" + + - variable: "CUSTOM_CONF" + label: "Custom Configuration" + description: | + Whether a custom configuration file should be mounted from the persistent data directory or not. Data Directory is required for this. + default: false + required: true + type: boolean + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + Leaving this blank will disable persistent data storage for the stack. + default: "Personal/Mongo" + required: false + type: string diff --git a/templates/Mongo/config.yml b/templates/Mongo/config.yml new file mode 100644 index 0000000..4559ad2 --- /dev/null +++ b/templates/Mongo/config.yml @@ -0,0 +1,8 @@ +name: Mongo +description: | + MongoDB is a cross-platform document-oriented database program. Classified as a NoSQL database program, MongoDB uses JSON-like documents with schemata. +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From 58592826356549453363dd386d921ae3f3542d8e Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 9 Feb 2019 12:37:31 -0500 Subject: [PATCH 17/28] Added Mongo Express GitHub page --- templates/Mongo/0/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/Mongo/0/README.md b/templates/Mongo/0/README.md index 5ae3faf..4aac4b1 100644 --- a/templates/Mongo/0/README.md +++ b/templates/Mongo/0/README.md @@ -1,5 +1,5 @@ -# Redis +# MongoDB -### Will continue this in the future +## Mongo Express -https://store.docker.com/_/redis \ No newline at end of file +[https://github.com/mongo-express/mongo-express] \ No newline at end of file From 5c6ae94f284c768f3c0a6ec48044a6e1a6e1b8c9 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Thu, 28 Feb 2019 15:51:15 -0500 Subject: [PATCH 18/28] First test of Cryptpad configuration --- templates/Cryptpad/0/README.md | 1 + templates/Cryptpad/0/docker-compose.yml | 36 ++++++++++++++++++++++++ templates/Cryptpad/0/rancher-compose.yml | 33 ++++++++++++++++++++++ templates/Cryptpad/config.yml | 8 ++++++ 4 files changed, 78 insertions(+) create mode 100644 templates/Cryptpad/0/README.md create mode 100644 templates/Cryptpad/0/docker-compose.yml create mode 100644 templates/Cryptpad/0/rancher-compose.yml create mode 100644 templates/Cryptpad/config.yml diff --git a/templates/Cryptpad/0/README.md b/templates/Cryptpad/0/README.md new file mode 100644 index 0000000..1b85b50 --- /dev/null +++ b/templates/Cryptpad/0/README.md @@ -0,0 +1 @@ +# Cryptpad \ No newline at end of file diff --git a/templates/Cryptpad/0/docker-compose.yml b/templates/Cryptpad/0/docker-compose.yml new file mode 100644 index 0000000..41c3c5e --- /dev/null +++ b/templates/Cryptpad/0/docker-compose.yml @@ -0,0 +1,36 @@ +version: '2' + +services: + cryptpad: + image: cryptpad/cryptpad:latest + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: true + ### Start Web Segment + traefik.frontend.entryPoints: http,https + traefik.frontend.headers.forceSTSHeader: true + traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) + traefik.frontend.headers.SSLRedirect: true + traefik.frontend.headers.STSPreload: true + traefik.frontend.headers.STSSeconds: 15552000 + traefik.frontend.passHostHeader: true + traefik.frontend.rule: Host:${TRAEFIK_HOST} + traefik.port: "3000" + ### End Web Segment + 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}/Blob:/cryptpad/blob + - /RancherCattle/${DATA_DIR}/BlobStage:/cryptpad/blobstage + - /RancherCattle/${DATA_DIR}/Block:/cryptpad/block + - /RancherCattle/${DATA_DIR}/Configuration:/cryptpad/customize + - /RancherCattle/${DATA_DIR}/Data:/cryptpad/datastore + - /RancherCattle/${DATA_DIR}/Pins:/cryptpad/pins + - /RancherCattle/${DATA_DIR}/Tasks:/cryptpad/tasks \ No newline at end of file diff --git a/templates/Cryptpad/0/rancher-compose.yml b/templates/Cryptpad/0/rancher-compose.yml new file mode 100644 index 0000000..0f30bf1 --- /dev/null +++ b/templates/Cryptpad/0/rancher-compose.yml @@ -0,0 +1,33 @@ +version: '2' +catalog: + name: Cryptpad + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Label Key/Value pair of the host which containers should be deployed + default: "host.id=Host1" + required: false + type: string + + - variable: "TRAEFIK_HOST" + label: "Public Host Domain" + description: | + The host that Traefik will use to provide public access. + default: "subdomain.domain.tld" + required: true + type: string + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/Cryptpad" + required: true + type: string \ No newline at end of file diff --git a/templates/Cryptpad/config.yml b/templates/Cryptpad/config.yml new file mode 100644 index 0000000..aef6617 --- /dev/null +++ b/templates/Cryptpad/config.yml @@ -0,0 +1,8 @@ +name: Cryptpad +description: | + Status: NOT READY +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From beda553642328860dcc3a4708b0436109dd9d6a4 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Thu, 28 Feb 2019 21:51:36 -0500 Subject: [PATCH 19/28] First trial config of Jellyfin --- templates/Jellyfin/0/README.md | 1 + templates/Jellyfin/0/docker-compose.yml | 32 +++++++++++++++++++++++ templates/Jellyfin/0/rancher-compose.yml | 33 ++++++++++++++++++++++++ templates/Jellyfin/config.yml | 8 ++++++ 4 files changed, 74 insertions(+) create mode 100644 templates/Jellyfin/0/README.md create mode 100644 templates/Jellyfin/0/docker-compose.yml create mode 100644 templates/Jellyfin/0/rancher-compose.yml create mode 100644 templates/Jellyfin/config.yml diff --git a/templates/Jellyfin/0/README.md b/templates/Jellyfin/0/README.md new file mode 100644 index 0000000..ec08986 --- /dev/null +++ b/templates/Jellyfin/0/README.md @@ -0,0 +1 @@ +# Jellyfin \ No newline at end of file diff --git a/templates/Jellyfin/0/docker-compose.yml b/templates/Jellyfin/0/docker-compose.yml new file mode 100644 index 0000000..7406fde --- /dev/null +++ b/templates/Jellyfin/0/docker-compose.yml @@ -0,0 +1,32 @@ +version: '2' + +services: + jellyfin: + image: jellyfin/jellyfin:latest + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: true + ### Start Web Segment + traefik.frontend.entryPoints: http,https + traefik.frontend.headers.forceSTSHeader: true + traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) + traefik.frontend.headers.SSLRedirect: true + traefik.frontend.headers.STSPreload: true + traefik.frontend.headers.STSSeconds: 15552000 + traefik.frontend.passHostHeader: true + traefik.frontend.rule: Host:${TRAEFIK_HOST} + traefik.port: "8096" + ### End Web Segment + 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}/Cache:/cache # Cache files + - /RancherCattle/${DATA_DIR}/Configuration:/config # Configuration files + - /RancherCattle/${DATA_DIR}/Media:/mnt/library # Media files \ No newline at end of file diff --git a/templates/Jellyfin/0/rancher-compose.yml b/templates/Jellyfin/0/rancher-compose.yml new file mode 100644 index 0000000..dad7898 --- /dev/null +++ b/templates/Jellyfin/0/rancher-compose.yml @@ -0,0 +1,33 @@ +version: '2' +catalog: + name: Jellyfin + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Label Key/Value pair of the host which containers should be deployed + default: "host.id=Host1" + required: false + type: string + + - variable: "TRAEFIK_HOST" + label: "Public Host Domain" + description: | + The host that Traefik will use to provide public access. + default: "subdomain.domain.tld" + required: true + type: string + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/Jellyfin" + required: true + type: string \ No newline at end of file diff --git a/templates/Jellyfin/config.yml b/templates/Jellyfin/config.yml new file mode 100644 index 0000000..1020046 --- /dev/null +++ b/templates/Jellyfin/config.yml @@ -0,0 +1,8 @@ +name: Jellyfin +description: | + Status: NOT READY +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From 144095f14bc4dfaea5e516094d206e3184db1c1f Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 15 Apr 2019 19:46:58 -0400 Subject: [PATCH 20/28] Testing with new setup instructions --- templates/Pydio-Cells/0/docker-compose.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index 1e64d4b..70ab04a 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -7,7 +7,7 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - CELLS_BIND: ${TRAEFIK_HOST}:80 + CELLS_BIND: localhost:80 CELLS_EXTERNAL: ${TRAEFIK_HOST}:443 CELLS_NO_SSL: 0 labels: @@ -32,11 +32,10 @@ services: 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}/Data:/root/.config/pydio/cells/data # Cells users' data files - - /RancherCattle/${DATA_DIR}/Logs:/root/.config/pydio/cells/logs # Cells logs - - /RancherCattle/${DATA_DIR}/Services:/root/.config/pydio/cells/services # Cells services information + - /RancherCattle/${DATA_DIR}:/root/.config/pydio/cells mysql: image: mysql:5 + command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci] dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 From afa42d97117a7b00f7e9ea6798533b7e7ec58d52 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 15 Apr 2019 19:51:50 -0400 Subject: [PATCH 21/28] Making things by-the-book --- templates/Pydio-Cells/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index 70ab04a..f7030ca 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -34,7 +34,7 @@ services: - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system - /RancherCattle/${DATA_DIR}:/root/.config/pydio/cells mysql: - image: mysql:5 + image: mysql:5.7 command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci] dns: # Using Cloudflare DNS - 1.1.1.1 From 453672fa6bacfa703f01cce5ef8029fde554daa7 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 15 Apr 2019 20:03:57 -0400 Subject: [PATCH 22/28] Put into quotes; crashes on startup with no logs... --- templates/Pydio-Cells/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Pydio-Cells/0/docker-compose.yml b/templates/Pydio-Cells/0/docker-compose.yml index f7030ca..86201ec 100644 --- a/templates/Pydio-Cells/0/docker-compose.yml +++ b/templates/Pydio-Cells/0/docker-compose.yml @@ -7,8 +7,8 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - CELLS_BIND: localhost:80 - CELLS_EXTERNAL: ${TRAEFIK_HOST}:443 + CELLS_BIND: "localhost:80" + CELLS_EXTERNAL: "${TRAEFIK_HOST}:443" CELLS_NO_SSL: 0 labels: io.rancher.container.pull_image: always From 3efd739c63ed3abc96de245abba6fa65bebdd79d Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Thu, 16 May 2019 14:15:03 -0400 Subject: [PATCH 23/28] Initial config to get things going --- templates/Grav/0/docker-compose.yml | 30 +++++++++++++++++++++++++ templates/Grav/0/rancher-compose.yml | 33 ++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 templates/Grav/0/docker-compose.yml create mode 100644 templates/Grav/0/rancher-compose.yml diff --git a/templates/Grav/0/docker-compose.yml b/templates/Grav/0/docker-compose.yml new file mode 100644 index 0000000..fef325c --- /dev/null +++ b/templates/Grav/0/docker-compose.yml @@ -0,0 +1,30 @@ +version: '2' + +services: + grav: + image: williammiceli/grav:latest-git + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: true + ### Start Grav Segment + traefik.frontend.entryPoints: http,https + traefik.frontend.headers.forceSTSHeader: true + traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) + traefik.frontend.headers.SSLRedirect: true + traefik.frontend.headers.STSPreload: true + traefik.frontend.headers.STSSeconds: 15552000 + traefik.frontend.passHostHeader: true + traefik.frontend.rule: Host:${TRAEFIK_HOST} + traefik.port: "80" + ### End Grav Segment + 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 +# - /Rancher/${DATA_DIR}/Backups:/ # Backups \ No newline at end of file diff --git a/templates/Grav/0/rancher-compose.yml b/templates/Grav/0/rancher-compose.yml new file mode 100644 index 0000000..c869807 --- /dev/null +++ b/templates/Grav/0/rancher-compose.yml @@ -0,0 +1,33 @@ +version: '2' +catalog: + name: Grav + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Label Key/Value pair of the host which containers should be deployed + default: "host.id=Host1" + required: false + type: string + + - variable: "TRAEFIK_HOST" + label: "Public Host Domain" + description: | + The host that Traefik will use to provide public access. + default: "subdomain.domain.tld" + required: true + type: string + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/Grav" + required: true + type: string From 1818afa406e0d941b6f44e476bad255e0ac8518e Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Thu, 16 May 2019 14:17:31 -0400 Subject: [PATCH 24/28] Added config file --- templates/Grav/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 templates/Grav/config.yml diff --git a/templates/Grav/config.yml b/templates/Grav/config.yml new file mode 100644 index 0000000..ce691b9 --- /dev/null +++ b/templates/Grav/config.yml @@ -0,0 +1,8 @@ +name: Grav +description: | + Status: EXPERIMENTAL +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From d28c3c2c3d5ee5758470cdd4bc9c4ff87e5fb051 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Thu, 16 May 2019 14:23:42 -0400 Subject: [PATCH 25/28] Added ports for debugging --- templates/Grav/0/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/Grav/0/docker-compose.yml b/templates/Grav/0/docker-compose.yml index fef325c..50cef21 100644 --- a/templates/Grav/0/docker-compose.yml +++ b/templates/Grav/0/docker-compose.yml @@ -23,6 +23,8 @@ services: traefik.frontend.rule: Host:${TRAEFIK_HOST} traefik.port: "80" ### End Grav Segment + ports: + - "80:80" restart: on-failure volumes: - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system From 2e98dfa33b464534e85f51b0e7e22c3140c2dc74 Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Fri, 17 May 2019 22:23:25 -0400 Subject: [PATCH 26/28] Removed ports; added volumes for backups and images --- templates/Grav/0/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/Grav/0/docker-compose.yml b/templates/Grav/0/docker-compose.yml index 50cef21..6a8786f 100644 --- a/templates/Grav/0/docker-compose.yml +++ b/templates/Grav/0/docker-compose.yml @@ -23,10 +23,9 @@ services: traefik.frontend.rule: Host:${TRAEFIK_HOST} traefik.port: "80" ### End Grav Segment - ports: - - "80:80" 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 -# - /Rancher/${DATA_DIR}/Backups:/ # Backups \ No newline at end of file + - /Rancher/${DATA_DIR}/Backups:/var/www/backup # Backups + - /Rancher/${DATA_DIR}/Images:/var/www/images # Images \ No newline at end of file From f624fc9ae4ec14f7ae325815c90ff1842421ca10 Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Sat, 18 May 2019 10:40:45 -0400 Subject: [PATCH 27/28] Specified :rw on volumes --- templates/Grav/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Grav/0/docker-compose.yml b/templates/Grav/0/docker-compose.yml index 6a8786f..0195a5e 100644 --- a/templates/Grav/0/docker-compose.yml +++ b/templates/Grav/0/docker-compose.yml @@ -27,5 +27,5 @@ services: 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 - - /Rancher/${DATA_DIR}/Backups:/var/www/backup # Backups - - /Rancher/${DATA_DIR}/Images:/var/www/images # Images \ No newline at end of file + - /Rancher/${DATA_DIR}/Backups:/var/www/backup:rw # Backups + - /Rancher/${DATA_DIR}/Images:/var/www/images:rw # Images \ No newline at end of file From 1e87080625369119471c7db7bcdc12bc5f07da83 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 28 May 2019 21:05:38 -0400 Subject: [PATCH 28/28] Got rid of some apps to do later --- templates/Matomo/0/README.md | 1 - templates/Matomo/0/docker-compose.yml | 25 ------ templates/Matomo/0/rancher-compose.yml | 49 ----------- templates/Matomo/config.yml | 8 -- templates/Mongo/0/README.md | 5 -- templates/Mongo/0/docker-compose.yml | 34 -------- templates/Mongo/0/rancher-compose.yml | 45 ---------- templates/Mongo/config.yml | 8 -- templates/Turtl/0/README.md | 1 - templates/Turtl/0/docker-compose.yml | 34 -------- templates/Turtl/0/rancher-compose.yml | 110 ------------------------- templates/Turtl/catalogIcon-turtl.svg | 1 - templates/Turtl/config.yml | 8 -- 13 files changed, 329 deletions(-) delete mode 100644 templates/Matomo/0/README.md delete mode 100644 templates/Matomo/0/docker-compose.yml delete mode 100644 templates/Matomo/0/rancher-compose.yml delete mode 100644 templates/Matomo/config.yml delete mode 100644 templates/Mongo/0/README.md delete mode 100644 templates/Mongo/0/docker-compose.yml delete mode 100644 templates/Mongo/0/rancher-compose.yml delete mode 100644 templates/Mongo/config.yml delete mode 100644 templates/Turtl/0/README.md delete mode 100644 templates/Turtl/0/docker-compose.yml delete mode 100644 templates/Turtl/0/rancher-compose.yml delete mode 100644 templates/Turtl/catalogIcon-turtl.svg delete mode 100644 templates/Turtl/config.yml diff --git a/templates/Matomo/0/README.md b/templates/Matomo/0/README.md deleted file mode 100644 index 5b5a6d1..0000000 --- a/templates/Matomo/0/README.md +++ /dev/null @@ -1 +0,0 @@ -# Matomo \ No newline at end of file diff --git a/templates/Matomo/0/docker-compose.yml b/templates/Matomo/0/docker-compose.yml deleted file mode 100644 index 35751a4..0000000 --- a/templates/Matomo/0/docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: "2" - -services: - matomo: - image: matomo:3.5-apache - restart: always - links: - - db - volumes: - - "./config:/var/www/html/config:rw" - - "./logs:/var/www/html/logs" - environment: - VIRTUAL_HOST: CHANGE_ME - ports: - - "80:80" - - db: - image: mariadb:latest - volumes: - - ./mysql/runtime2:/var/lib/mysql - environment: - MYSQL_DATABASE: matomo_db - MYSQL_ROOT_PASSWORD: CHANGE_ME - MYSQL_USER: matomo_user - MYSQL_PASSWORD: CHANGE_ME \ No newline at end of file diff --git a/templates/Matomo/0/rancher-compose.yml b/templates/Matomo/0/rancher-compose.yml deleted file mode 100644 index 4b547a8..0000000 --- a/templates/Matomo/0/rancher-compose.yml +++ /dev/null @@ -1,49 +0,0 @@ -version: '2' -catalog: - name: Matomo - version: latest - # description: - # minimum_rancher_version: - # maximum_rancher_version: - # upgrade_from: - questions: - - - variable: "HOST_LABEL" - label: "Host Label Key/Value Pair" - description: | - The Label Key/Value pair of the host which containers should be deployed - default: "host.id=Host1" - required: false - type: string - - - variable: "TRAEFIK_HOST" - label: "Public Host Domain" - description: | - The host that Traefik will use to provide public access. - default: "subdomain.domain.tld" - required: true - type: string - - - variable: "DB_ROOT_PASS" - label: "Database Root Password" - description: | - A secure password to be used by the "root" database user. - # default: - required: true - type: password - - - variable: "DB_USER_PASS" - label: "Database User Password" - description: | - A secure password to be used by the "matomo_user" database user. - # default: - required: true - type: password - - - variable: "DATA_DIR" - label: "Data Directory" - description: | - The directory to store persistent data for the stack. - default: "Personal/Matomo" - required: true - type: string \ No newline at end of file diff --git a/templates/Matomo/config.yml b/templates/Matomo/config.yml deleted file mode 100644 index e21b6da..0000000 --- a/templates/Matomo/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Matomo -description: | - Status: NOT READY -version: latest -# category: -maintainer: WilliamMiceli -# license: -# projectURL: \ No newline at end of file diff --git a/templates/Mongo/0/README.md b/templates/Mongo/0/README.md deleted file mode 100644 index 4aac4b1..0000000 --- a/templates/Mongo/0/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# MongoDB - -## Mongo Express - -[https://github.com/mongo-express/mongo-express] \ No newline at end of file diff --git a/templates/Mongo/0/docker-compose.yml b/templates/Mongo/0/docker-compose.yml deleted file mode 100644 index 171eb30..0000000 --- a/templates/Mongo/0/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: '2' - -services: - mongo: - image: mongo:${IMAGE_TAG} - dns: # Using Cloudflare DNS - - 1.1.1.1 - - 1.0.0.1 - labels: - io.rancher.container.pull_image: always - {{- if .Values.HOST_LABEL}} - io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} - {{- end}} - traefik.enable: false - restart: on-failure - stdin_open: true - tty: true - 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 - {{- if .Values.DATA_DIR}} - {{- if eq .Values.CUSTOM_CONF "true"}} - - /RancherCattle/${DATA_DIR}/Configuration:/etc/mongo - {{- end}} - - /RancherCattle/${DATA_DIR}/Data:/data/db - {{- end}} - mongo-express: - image: mongo-express - restart: always - ports: - - 8081:8081 - environment: - ME_CONFIG_MONGODB_ADMINUSERNAME: root - ME_CONFIG_MONGODB_ADMINPASSWORD: example \ No newline at end of file diff --git a/templates/Mongo/0/rancher-compose.yml b/templates/Mongo/0/rancher-compose.yml deleted file mode 100644 index 0c24d37..0000000 --- a/templates/Mongo/0/rancher-compose.yml +++ /dev/null @@ -1,45 +0,0 @@ -version: '2' -catalog: - name: Mongo - version: latest - # description: - # minimum_rancher_version: - # maximum_rancher_version: - # upgrade_from: - # uuid: - questions: - - - variable: "HOST_LABEL" - label: "Host Label Key/Value Pair" - description: | - The Key/Value pair on the host which the stack should be deployed. - default: "host.id=Host1" - required: false - type: string - - - variable: "IMAGE_TAG" - label: "Image Tag" - description: | - The image tag to use for the desired container variant. - default: "latest" - required: true - type: enum - options: - - "latest" - - - variable: "CUSTOM_CONF" - label: "Custom Configuration" - description: | - Whether a custom configuration file should be mounted from the persistent data directory or not. Data Directory is required for this. - default: false - required: true - type: boolean - - - variable: "DATA_DIR" - label: "Data Directory" - description: | - The directory to store persistent data for the stack. - Leaving this blank will disable persistent data storage for the stack. - default: "Personal/Mongo" - required: false - type: string diff --git a/templates/Mongo/config.yml b/templates/Mongo/config.yml deleted file mode 100644 index 4559ad2..0000000 --- a/templates/Mongo/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Mongo -description: | - MongoDB is a cross-platform document-oriented database program. Classified as a NoSQL database program, MongoDB uses JSON-like documents with schemata. -version: latest -# category: -maintainer: WilliamMiceli -# license: -# projectURL: \ No newline at end of file diff --git a/templates/Turtl/0/README.md b/templates/Turtl/0/README.md deleted file mode 100644 index 874cefe..0000000 --- a/templates/Turtl/0/README.md +++ /dev/null @@ -1 +0,0 @@ -# Turtl \ No newline at end of file diff --git a/templates/Turtl/0/docker-compose.yml b/templates/Turtl/0/docker-compose.yml deleted file mode 100644 index 3a129a4..0000000 --- a/templates/Turtl/0/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -turtl-api-data: - labels: - io.rancher.container.start_once: 'true' - entrypoint: - - /bin/true - image: busybox - volumes: - - /opt/api/uploads - - /var/lib/rethinkdb/instance1 - -turtl-api: - ports: - - 8181:8181/tcp - environment: - DISPLAY_ERRORS: ${DISPLAY_ERRORS} - FQDN: ${FQDN} - SITE_URL: ${SITE_URL} - LOCAL_UPLOAD_URL: ${LOCAL_UPLOAD_URL} - LOCAL_UPLOAD_PATH: ${LOCAL_UPLOAD_PATH} - AWS_S3_TOKEN: ${AWS_S3_TOKEN} - ADMIN_EMAIL: ${ADMIN_EMAIL} - EMAIL_FROM: ${EMAIL_FROM} - SMTP_USER: ${SMTP_USER} - SMTP_PASS: ${SMTP_PASS} - DEFAULT_STORAGE_LIMIT: ${DEFAULT_STORAGE_LIMIT} - STORAGE_INVITE_CREDIT: ${STORAGE_INVITE_CREDIT} - image: webofmars/turtl-docker:latest - stdin_open: true - tty: true - labels: - io.rancher.container.pull_image: always - io.rancher.sidekicks: turtl-api-data - volumes_from: - - turtl-api-data \ No newline at end of file diff --git a/templates/Turtl/0/rancher-compose.yml b/templates/Turtl/0/rancher-compose.yml deleted file mode 100644 index 5bc83d3..0000000 --- a/templates/Turtl/0/rancher-compose.yml +++ /dev/null @@ -1,110 +0,0 @@ -version: '2' -catalog: - name: Turtl - version: latest - # description: - # minimum_rancher_version: - # maximum_rancher_version: - # upgrade_from: - questions: - - - variable: "DISPLAY_ERRORS" - descrition: "Display errors" - label: "Display errors: " - required: false - default: "t" - type: "string" - - - variable: "FQDN" - description: "Fully Qualified Domain Name (ex: 'notes.example.com')." - label: "fqdn" - required: true - default: "turtl.local" - type: "string" - - - variable: "SITE_URL" - description: "The uri used to access the turtl api" - label: "site url" - required: true - default: "http://turtl.local" - type: "string" - - - variable: "LOCAL_UPLOAD_PATH" - description: "The local path of the uploaded content." - label: "uploads local path" - required: false - default: "" - type: "string" - - - variable: "LOCAL_UPLOAD_URL" - description: "The urls used to retrieve uploaded content. Must be set if you change LOCAL_UPLOAD_PATH. (ex: http://turtl.local)" - label: "local upload url" - required: false - default: "" - type: "string" - - - variable: "AWS_S3_TOKEN" - description: | - Amazon Web Services S3 token. Used only if you use S3 as a storage backend. ex : (:token '' - secret '' - bucket '' - endpoint 'https://s3.amazonaws.com') - label: "AWS S3 token" - required: false - default: "" - type: "string" - - - variable: "ADMIN_EMAIL" - description: "email adresse of administrator ex: admin@example.com" - label: "Admin e-mail" - required: false - default: "" - type: "string" - - - variable: "EMAIL_FROM" - description: "The e-mail adress used to send the e-mail from turtl to users." - label: "e-mail from" - required: false - default: "" - type: "string" - - - variable: "SMTP_USER" - description: "The user used to authenticate to the smtp server. Can be blank." - label: "smtp user" - required: false - default: "" - type: "string" - - - variable: "SMTP_PASS" - description: "The password used to authenticate to the smtp server. Can be blank." - label: "smtp password" - required: false - default: "" - type: "string" - - - variable: "STORAGE_INVITE_CREDIT" - description: "The number of MB a user gain when he invites someone" - label: "storage invite credit" - required: false - default: "" - type: "int" - - - variable: "DEFAULT_STORAGE_LIMIT" - description: "Maximum storage space (in MB) that can be used by a single user (ex: 1000)" - label: "Default Storage Limit" - required: false - default: "" - type: "int" - -turtl-api-data: - scale: 1 -turtl-api: - scale: 1 - health_check: - port: 8181 - interval: 2000 - initializing_timeout: 300000 - unhealthy_threshold: 10 - strategy: recreate - response_timeout: 2000 - healthy_threshold: 2 \ No newline at end of file diff --git a/templates/Turtl/catalogIcon-turtl.svg b/templates/Turtl/catalogIcon-turtl.svg deleted file mode 100644 index b0a8b87..0000000 --- a/templates/Turtl/catalogIcon-turtl.svg +++ /dev/null @@ -1 +0,0 @@ -catalogIcon-turtlTURTLW \ No newline at end of file diff --git a/templates/Turtl/config.yml b/templates/Turtl/config.yml deleted file mode 100644 index 40a4c5a..0000000 --- a/templates/Turtl/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Turtl -description: | - Status: NOT READY -# version: -category: Productivity -maintainer: WilliamMiceli -# license: -# projectURL: https://github.com/webofmars/turtl-docker \ No newline at end of file