From f649d7eefd79276abb8cedbfb8d3be067a4cf887 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 28 May 2019 21:32:15 -0400 Subject: [PATCH 01/19] Added missing files from master --- Cool Stuff.md | 27 ++++++- templates/GitLab-Runner/0/README.md | 5 ++ templates/GitLab-Runner/0/docker-compose.yml | 64 ++++++++++++++++ templates/GitLab-Runner/0/rancher-compose.yml | 75 +++++++++++++++++++ templates/GitLab-Runner/config.yml | 8 ++ 5 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 templates/GitLab-Runner/0/README.md create mode 100644 templates/GitLab-Runner/0/docker-compose.yml create mode 100644 templates/GitLab-Runner/0/rancher-compose.yml create mode 100644 templates/GitLab-Runner/config.yml diff --git a/Cool Stuff.md b/Cool Stuff.md index 1823c6f..9693a13 100644 --- a/Cool Stuff.md +++ b/Cool Stuff.md @@ -28,7 +28,32 @@ [http://sabre.io/baikal/] [https://radicale.org/] [https://www.xandikos.org/] - +[https://hub.docker.com/r/libreplan/libreplan/] +[https://hub.docker.com/r/fjudith/draw.io] +[https://hub.docker.com/r/linuxserver/openvpn-as] +[https://hub.docker.com/_/drupal] +[https://hub.docker.com/_/redmine] +[https://hub.docker.com/_/node] +[https://hub.docker.com/r/zabbix/zabbix-server-mysql] +[https://hub.docker.com/r/zulip/zulip-postgresql] +[https://hub.docker.com/r/zulip/docker-zulip] +[https://hub.docker.com/r/openhab/openhab] +[https://hub.docker.com/r/devdocs/devdocs] +[https://hub.docker.com/r/bitnami/opencart] +[https://polrproject.org/] +[https://hub.docker.com/r/prestashop/prestashop] +[https://wiki.js.org/] +[https://getcockpit.com/] +[https://hub.docker.com/r/agentejo/cockpit] +[https://hub.docker.com/r/homeassistant/home-assistant] +- Factorio +- Eclipse Theia +- Joomla +- Matomo +- MediaWiki +- Mongo +- Transmission +- YOURLS ###### GitLab Runner diff --git a/templates/GitLab-Runner/0/README.md b/templates/GitLab-Runner/0/README.md new file mode 100644 index 0000000..1005fad --- /dev/null +++ b/templates/GitLab-Runner/0/README.md @@ -0,0 +1,5 @@ +# GitLab Runner + +## Technical Notes + +* Using "Docker-in-Docker" type of configuration, [Described Here](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-executor) \ No newline at end of file diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml new file mode 100644 index 0000000..a31c721 --- /dev/null +++ b/templates/GitLab-Runner/0/docker-compose.yml @@ -0,0 +1,64 @@ +version: '2' + +services: + gitlab-runner-config: + image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners + command: + - register + - --non-interactive + - --url + - ${GITLAB_URL} + - --registration-token + - ${GITLAB_TOKEN} + - --executor + - "docker" + {{- if .Values.GITLAB_RUNNER_DESCRIPTION}} + - --description + - ${GITLAB_RUNNER_DESCRIPTION} + {{- end}} + {{- if .Values.GITLAB_TAGS}} + - --tag-list + - ${GITLAB_TAGS} + {{- end}} + - --locked=false + - --docker-image + - docker:latest + - --docker-privileged + {{- if .Values.GITLAB_IP}} + - --docker-extra-hosts + - "gitlab:${GITLAB_IP}" + {{- end}} + {{- if .Values.GITLAB_LINK}} + external_links: + - ${GITLAB_LINK}:gitlab + {{- end}} + labels: + io.rancher.container.pull_image: always + io.rancher.container.start_once: true + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: false + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /Rancher/${DATA_DIR}:/etc/gitlab-runner + gitlab-runner: + image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners + command: + - run + {{- if .Values.GITLAB_LINK}} + external_links: + - ${GITLAB_LINK}:gitlab + {{- end}} + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + io.rancher.sidekicks: gitlab-runner-config + traefik.enable: false + privileged: true + restart: always + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /Rancher/${DATA_DIR}:/etc/gitlab-runner diff --git a/templates/GitLab-Runner/0/rancher-compose.yml b/templates/GitLab-Runner/0/rancher-compose.yml new file mode 100644 index 0000000..b1d6e51 --- /dev/null +++ b/templates/GitLab-Runner/0/rancher-compose.yml @@ -0,0 +1,75 @@ +version: '2' +catalog: + name: GitLab Runner + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + # uuid: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + (Optional) The Key/Value pair of the host which the stack should be deployed. + default: "host.id=Host2" + required: false + type: string + + - variable: "GITLAB_URL" + label: "GitLab URL" + description: | + The URL which your GitLab instance can be reached at. + You can use the service selection and alias to create a direct link if it is in your Rancher environment. + default: "http://gitlab/" + required: true + type: string + + - variable: "GITLAB_TOKEN" + label: "GitLab Registration Token" + description: | + The registration token provided by the GitLab instance. + # default: + required: true + type: string + + - variable: "GITLAB_RUNNER_DESCRIPTION" + label: "GitLab Runner Description" + description: | + (Optional) A description for the GitLab Runner. + # default: + required: false + type: string + + - variable: "GITLAB_TAGS" + label: "GitLab Runner Tags" + description: | + (Optional) Tags for the GitLab Runner, separated by a comma. + These can be changed later in GitLab. + default: "docker" + required: false + type: string + + - variable: "GITLAB_LINK" + label: "GitLab Service" + description: | + (Optional) Create a direct link to the GitLab service. + required: false + type: service + + - variable: "GITLAB_IP" + label: "Local GitLab IP" + description: | + (Optional) The local IP address of the GitLab service. + # default: "" + required: false + type: string + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/GitLab-Runner" + required: true + type: string \ No newline at end of file diff --git a/templates/GitLab-Runner/config.yml b/templates/GitLab-Runner/config.yml new file mode 100644 index 0000000..2da9a7d --- /dev/null +++ b/templates/GitLab-Runner/config.yml @@ -0,0 +1,8 @@ +name: GitLab Runner +description: | + STATUS: Experimental +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From abc33901a183930db85a8445e541c5a71332ab20 Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Fri, 31 May 2019 17:06:29 -0400 Subject: [PATCH 02/19] Removed "images" directory, as it is only a cache; added "logs" and "user" --- templates/Grav/0/docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/Grav/0/docker-compose.yml b/templates/Grav/0/docker-compose.yml index 0195a5e..8e3a0fb 100644 --- a/templates/Grav/0/docker-compose.yml +++ b/templates/Grav/0/docker-compose.yml @@ -27,5 +27,6 @@ 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:rw # Backups - - /Rancher/${DATA_DIR}/Images:/var/www/images:rw # Images \ No newline at end of file + - /Rancher/${DATA_DIR}/Backups:/var/www/backup # Backups + - /Rancher/${DATA_DIR}/Logs:/var/www/logs # Logs + - /Rancher/${DATA_DIR}/User:/var/www/user # User \ No newline at end of file From a5444b5e2233ed92ec6612294ab58c42d0e7be34 Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Fri, 31 May 2019 21:53:27 -0400 Subject: [PATCH 03/19] Added SilverStripe --- Cool Stuff.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Cool Stuff.md b/Cool Stuff.md index 9693a13..5941add 100644 --- a/Cool Stuff.md +++ b/Cool Stuff.md @@ -54,6 +54,7 @@ - Mongo - Transmission - YOURLS +[https://www.silverstripe.com/] ###### GitLab Runner From a1fd4f9c4287b2eab6d54d5c9e1081ab0dcc7be1 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 12:53:32 -0400 Subject: [PATCH 04/19] Added CloudFlare's IPv6 addresses --- templates/Bind/0/docker-compose.yml | 2 ++ templates/Cryptpad/0/docker-compose.yml | 2 ++ templates/Ghost/0/docker-compose.yml | 2 ++ templates/GitLab/0/docker-compose.yml | 2 ++ templates/Gitea/0/docker-compose.yml | 4 ++++ templates/Grav/0/docker-compose.yml | 2 ++ templates/Guacamole/0/docker-compose.yml | 4 ++++ templates/HTTPD/0/docker-compose.yml | 2 ++ templates/InvoiceNinja/0/docker-compose.yml | 8 ++++++++ templates/Jellyfin/0/docker-compose.yml | 2 ++ templates/Nextcloud/0/docker-compose.yml | 6 ++++++ templates/Nginx/0/docker-compose.yml | 2 ++ templates/OpenProject/0/docker-compose.yml | 2 ++ templates/PHPMyAdmin/0/docker-compose.yml | 2 ++ templates/Pydio-Cells/0/docker-compose.yml | 4 ++++ templates/Redis/0/docker-compose.yml | 2 ++ templates/RocketChat/0/docker-compose.yml | 6 ++++++ templates/Snipe-IT/0/docker-compose.yml | 4 ++++ templates/Traefik/0/docker-compose.yml | 2 ++ templates/Wiki.js-v1/0/docker-compose.yml | 4 ++++ templates/WordPress/0/docker-compose.yml | 4 ++++ templates/XWiki/0/docker-compose.yml | 4 ++++ templates/YOURLS/0/docker-compose.yml | 4 ++++ 23 files changed, 76 insertions(+) diff --git a/templates/Bind/0/docker-compose.yml b/templates/Bind/0/docker-compose.yml index 5d6f56e..24adb08 100644 --- a/templates/Bind/0/docker-compose.yml +++ b/templates/Bind/0/docker-compose.yml @@ -5,6 +5,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 environment: WEBMIN_ENABLED: ${WEBMIN_ENABLED} {{- if eq .Values.WEBMIN_ENABLED "true"}} diff --git a/templates/Cryptpad/0/docker-compose.yml b/templates/Cryptpad/0/docker-compose.yml index 41c3c5e..753c55e 100644 --- a/templates/Cryptpad/0/docker-compose.yml +++ b/templates/Cryptpad/0/docker-compose.yml @@ -6,6 +6,8 @@ services: dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} diff --git a/templates/Ghost/0/docker-compose.yml b/templates/Ghost/0/docker-compose.yml index a7348b0..2506595 100644 --- a/templates/Ghost/0/docker-compose.yml +++ b/templates/Ghost/0/docker-compose.yml @@ -6,6 +6,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 environment: {{- if .Values.TRAEFIK_HOST}} node_env: production diff --git a/templates/GitLab/0/docker-compose.yml b/templates/GitLab/0/docker-compose.yml index 6ed3671..c8d4356 100644 --- a/templates/GitLab/0/docker-compose.yml +++ b/templates/GitLab/0/docker-compose.yml @@ -6,6 +6,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 environment: GITLAB_OMNIBUS_CONFIG: | external_url 'https://${TRAEFIK_HOST}' diff --git a/templates/Gitea/0/docker-compose.yml b/templates/Gitea/0/docker-compose.yml index 80aab9e..bfa315c 100644 --- a/templates/Gitea/0/docker-compose.yml +++ b/templates/Gitea/0/docker-compose.yml @@ -6,6 +6,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 environment: USER_UID: '1000' USER_GID: '1000' @@ -46,6 +48,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 environment: POSTGRES_DB: gitea_db POSTGRES_USER: gitea_user diff --git a/templates/Grav/0/docker-compose.yml b/templates/Grav/0/docker-compose.yml index 8e3a0fb..e0c7ad2 100644 --- a/templates/Grav/0/docker-compose.yml +++ b/templates/Grav/0/docker-compose.yml @@ -6,6 +6,8 @@ services: dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} diff --git a/templates/Guacamole/0/docker-compose.yml b/templates/Guacamole/0/docker-compose.yml index 0a2c4c1..af9e337 100644 --- a/templates/Guacamole/0/docker-compose.yml +++ b/templates/Guacamole/0/docker-compose.yml @@ -6,6 +6,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 environment: GUACD_HOSTNAME: guacd MYSQL_HOSTNAME: mysql @@ -58,6 +60,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 environment: MYSQL_DATABASE: guacamole_db MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} diff --git a/templates/HTTPD/0/docker-compose.yml b/templates/HTTPD/0/docker-compose.yml index 964dd86..f044c4a 100644 --- a/templates/HTTPD/0/docker-compose.yml +++ b/templates/HTTPD/0/docker-compose.yml @@ -6,6 +6,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} diff --git a/templates/InvoiceNinja/0/docker-compose.yml b/templates/InvoiceNinja/0/docker-compose.yml index accaeb3..d27c026 100644 --- a/templates/InvoiceNinja/0/docker-compose.yml +++ b/templates/InvoiceNinja/0/docker-compose.yml @@ -6,6 +6,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 labels: io.rancher.container.pull_image: always {{- if (.Values.HOST_LABEL)}} @@ -26,6 +28,8 @@ services: dns: - 1.1.1.1 - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 entrypoint: | bash -c 'bash -s < Date: Sat, 1 Jun 2019 12:53:51 -0400 Subject: [PATCH 05/19] First trial of Joomla setup --- templates/Joomla/0/README.md | 1 + templates/Joomla/0/docker-compose.yml | 61 +++++++++++++++++++++ templates/Joomla/0/rancher-compose.yml | 73 ++++++++++++++++++++++++++ templates/Joomla/config.yml | 8 +++ 4 files changed, 143 insertions(+) create mode 100644 templates/Joomla/0/README.md create mode 100644 templates/Joomla/0/docker-compose.yml create mode 100644 templates/Joomla/0/rancher-compose.yml create mode 100644 templates/Joomla/config.yml diff --git a/templates/Joomla/0/README.md b/templates/Joomla/0/README.md new file mode 100644 index 0000000..65190bd --- /dev/null +++ b/templates/Joomla/0/README.md @@ -0,0 +1 @@ +# Joomla \ No newline at end of file diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml new file mode 100644 index 0000000..2eaaf47 --- /dev/null +++ b/templates/Joomla/0/docker-compose.yml @@ -0,0 +1,61 @@ +version: '2' + +services: + joomla: + image: joomla:fpm-alpine + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 + environment: + JOOMLA_DB_HOST: postgres + JOOMLA_DB_NAME: joomla_db + JOOMLA_DB_USER: joomla_user + JOOMLA_DB_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: true + ### Start Joomla 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 Joomla Segment + links: + - postgres + 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}/Files:/var/www/html # Joomla Public Files + postgres: + image: postgres:latest + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 + environment: + POSTGRES_DB: joomla_db + POSTGRES_USER: joomla_user + POSTGRES_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 + - /Rancher/${DATA_DIR}/Database:/var/lib/postgresql/data # PostgreSQL data diff --git a/templates/Joomla/0/rancher-compose.yml b/templates/Joomla/0/rancher-compose.yml new file mode 100644 index 0000000..454187d --- /dev/null +++ b/templates/Joomla/0/rancher-compose.yml @@ -0,0 +1,73 @@ +version: '2' +catalog: + name: Nextcloud + 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 "nextcloud_user" database user. + # default: + required: true + type: password + + - variable: "NC_ADMIN" + label: "Nextcloud Admin Username" + description: | + The username of the Nextcloud admin user. + # default: + required: true + type: string + + - variable: "NC_ADMIN_PASS" + label: "Nextcloud Admin Password" + description: | + A secure password for the Nextcloud admin user. + # default: + required: true + type: password + + - variable: "REDIS" + label: "Enable Redis" + description: | + Add a Redis container for memory caching. Additional setup required, see README. + default: true + required: true + type: boolean + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/Nextcloud" + required: true + type: string \ No newline at end of file diff --git a/templates/Joomla/config.yml b/templates/Joomla/config.yml new file mode 100644 index 0000000..087fb87 --- /dev/null +++ b/templates/Joomla/config.yml @@ -0,0 +1,8 @@ +name: Joomla +description: | + +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From b6e90475dbcd317ad9aedcf9d1ef9820061ede6f Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 12:55:30 -0400 Subject: [PATCH 06/19] Updated for Joomla --- templates/Joomla/0/rancher-compose.yml | 38 ++------------------------ 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/templates/Joomla/0/rancher-compose.yml b/templates/Joomla/0/rancher-compose.yml index 454187d..1247cda 100644 --- a/templates/Joomla/0/rancher-compose.yml +++ b/templates/Joomla/0/rancher-compose.yml @@ -1,6 +1,6 @@ version: '2' catalog: - name: Nextcloud + name: Joomla version: latest # description: # minimum_rancher_version: @@ -24,50 +24,18 @@ catalog: 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 "nextcloud_user" database user. + A secure password to be used by the database user. # default: required: true type: password - - variable: "NC_ADMIN" - label: "Nextcloud Admin Username" - description: | - The username of the Nextcloud admin user. - # default: - required: true - type: string - - - variable: "NC_ADMIN_PASS" - label: "Nextcloud Admin Password" - description: | - A secure password for the Nextcloud admin user. - # default: - required: true - type: password - - - variable: "REDIS" - label: "Enable Redis" - description: | - Add a Redis container for memory caching. Additional setup required, see README. - default: true - required: true - type: boolean - - variable: "DATA_DIR" label: "Data Directory" description: | The directory to store persistent data for the stack. - default: "Personal/Nextcloud" + default: "Personal/Joomla" required: true type: string \ No newline at end of file From 47a146f7db221aaf9c29bf62b5aaeecdb42e9826 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 13:51:57 -0400 Subject: [PATCH 07/19] Added correct port for PostgreSQL --- templates/Joomla/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index 2eaaf47..ba4c859 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -9,7 +9,7 @@ services: - 2606:4700:4700::1111 - 2606:4700:4700::1001 environment: - JOOMLA_DB_HOST: postgres + JOOMLA_DB_HOST: postgres:5432 JOOMLA_DB_NAME: joomla_db JOOMLA_DB_USER: joomla_user JOOMLA_DB_PASSWORD: ${DB_USER_PASS} From 7529af785aa0e88cda4c78999f1b2b8e86dc2aa6 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 14:07:13 -0400 Subject: [PATCH 08/19] Switched to MySQL --- templates/Joomla/0/docker-compose.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index ba4c859..80bb0a0 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -9,7 +9,7 @@ services: - 2606:4700:4700::1111 - 2606:4700:4700::1001 environment: - JOOMLA_DB_HOST: postgres:5432 + JOOMLA_DB_HOST: mysql JOOMLA_DB_NAME: joomla_db JOOMLA_DB_USER: joomla_user JOOMLA_DB_PASSWORD: ${DB_USER_PASS} @@ -31,23 +31,24 @@ services: traefik.port: "80" ### End Joomla Segment links: - - postgres + - 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 - /Rancher/${DATA_DIR}/Files:/var/www/html # Joomla Public Files - postgres: - image: postgres:latest + mysql: + image: mysql:5 dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 - 2606:4700:4700::1111 - 2606:4700:4700::1001 environment: - POSTGRES_DB: joomla_db - POSTGRES_USER: joomla_user - POSTGRES_PASSWORD: ${DB_USER_PASS} + MYSQL_DATABASE: joomla_db + MYSQL_ROOT_PASSWORD: + MYSQL_USER: joomla_user + MYSQL_PASSWORD: ${DB_USER_PASS} labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} @@ -58,4 +59,4 @@ 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}/Database:/var/lib/postgresql/data # PostgreSQL data + - /Rancher/${DATA_DIR}/Database:/var/lib/mysql # MySQL data From d21a6cf2df50e3f75adbba70c9b9041955f585d0 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 14:36:16 -0400 Subject: [PATCH 09/19] Added MySQL root password variable and question --- templates/Joomla/0/docker-compose.yml | 2 +- templates/Joomla/0/rancher-compose.yml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index 80bb0a0..195f22d 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -46,7 +46,7 @@ services: - 2606:4700:4700::1001 environment: MYSQL_DATABASE: joomla_db - MYSQL_ROOT_PASSWORD: + MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} MYSQL_USER: joomla_user MYSQL_PASSWORD: ${DB_USER_PASS} labels: diff --git a/templates/Joomla/0/rancher-compose.yml b/templates/Joomla/0/rancher-compose.yml index 1247cda..a8a3788 100644 --- a/templates/Joomla/0/rancher-compose.yml +++ b/templates/Joomla/0/rancher-compose.yml @@ -24,6 +24,14 @@ catalog: 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: | From c87f4613550666b2b20f8225803290b9608872f4 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 14:44:47 -0400 Subject: [PATCH 10/19] Changed image tag to latest --- templates/Joomla/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index 195f22d..ab5d596 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: joomla: - image: joomla:fpm-alpine + image: joomla:latest dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 From 96192bcd692c5b1e2972e44bbef22e565a894a3d Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 16:07:05 -0400 Subject: [PATCH 11/19] Added dropdown for choice of PHP version --- templates/Joomla/0/docker-compose.yml | 4 +++- templates/Joomla/0/rancher-compose.yml | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index ab5d596..be69188 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -2,7 +2,9 @@ version: '2' services: joomla: - image: joomla:latest + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.1)"}}image: joomla:php7.1-apache{{- else}} + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.2)"}}image: joomla:php7.2-apache{{- else}} + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.3)"}}image: joomla:php7.3-apache{{- end}} dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 diff --git a/templates/Joomla/0/rancher-compose.yml b/templates/Joomla/0/rancher-compose.yml index a8a3788..e2c0a4a 100644 --- a/templates/Joomla/0/rancher-compose.yml +++ b/templates/Joomla/0/rancher-compose.yml @@ -40,6 +40,18 @@ catalog: required: true type: password + - variable: "IMAGE_VERSION" + label: "Image Version" + description: | + What version of the image should be used. + # default: + required: true + type: enum + options: + - Apache (PHP 7.1) + - Apache (PHP 7.2) + - Apache (PHP 7.3) + - variable: "DATA_DIR" label: "Data Directory" description: | From a2dcdbcfbb935099ad0b02868d487d02bfac7c15 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 16:09:56 -0400 Subject: [PATCH 12/19] Testing syntax fix --- templates/Joomla/0/docker-compose.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index be69188..706f77e 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -2,9 +2,14 @@ version: '2' services: joomla: - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.1)"}}image: joomla:php7.1-apache{{- else}} - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.2)"}}image: joomla:php7.2-apache{{- else}} - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.3)"}}image: joomla:php7.3-apache{{- end}} + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.1)"}}image: joomla:php7.1-apache + {{- else}} + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.2)"}}image: joomla:php7.2-apache + {{- else}} + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.3)"}}image: joomla:php7.3-apache + {{- end}} + {{- end}} + {{- end}} dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 From 7683c0adfb349aed832d78e9b1aacbee827294e3 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 16:12:53 -0400 Subject: [PATCH 13/19] Testing syntax fix --- templates/Joomla/0/docker-compose.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index 706f77e..8ea2daf 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -2,14 +2,9 @@ version: '2' services: joomla: - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.1)"}}image: joomla:php7.1-apache - {{- else}} - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.2)"}}image: joomla:php7.2-apache - {{- else}} - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.3)"}}image: joomla:php7.3-apache - {{- end}} - {{- end}} - {{- end}} + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.1)"}}image: joomla:php7.1-apache{{- end}} + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.2)"}}image: joomla:php7.2-apache{{- end}} + {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.3)"}}image: joomla:php7.3-apache{{- end}} dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 From 9428d11a872a56a057ba7d2d6c4db9213e3f050e Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Jun 2019 16:15:59 -0400 Subject: [PATCH 14/19] I guess we're just not allowed to make things look nice... --- templates/Joomla/0/docker-compose.yml | 4 +--- templates/Joomla/0/rancher-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index 8ea2daf..28b7f47 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -2,9 +2,7 @@ version: '2' services: joomla: - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.1)"}}image: joomla:php7.1-apache{{- end}} - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.2)"}}image: joomla:php7.2-apache{{- end}} - {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.3)"}}image: joomla:php7.3-apache{{- end}} + image: joomla:${IMAGE_VERSION} dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 diff --git a/templates/Joomla/0/rancher-compose.yml b/templates/Joomla/0/rancher-compose.yml index e2c0a4a..bf2b07a 100644 --- a/templates/Joomla/0/rancher-compose.yml +++ b/templates/Joomla/0/rancher-compose.yml @@ -48,9 +48,9 @@ catalog: required: true type: enum options: - - Apache (PHP 7.1) - - Apache (PHP 7.2) - - Apache (PHP 7.3) + - php7.1-apache + - php7.2-apache + - php7.3-apache - variable: "DATA_DIR" label: "Data Directory" From 4251385a3a0394252b84fd633e5f238460c1e879 Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Mon, 3 Jun 2019 16:01:39 -0400 Subject: [PATCH 15/19] Using my own modified Joomla image to increase maximum PHP upload limit to 64MB --- templates/Joomla/0/docker-compose.yml | 2 +- templates/Joomla/0/rancher-compose.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml index 28b7f47..50c1836 100644 --- a/templates/Joomla/0/docker-compose.yml +++ b/templates/Joomla/0/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: joomla: - image: joomla:${IMAGE_VERSION} + image: williammiceli/joomla:${IMAGE_VERSION} dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 diff --git a/templates/Joomla/0/rancher-compose.yml b/templates/Joomla/0/rancher-compose.yml index bf2b07a..31501c4 100644 --- a/templates/Joomla/0/rancher-compose.yml +++ b/templates/Joomla/0/rancher-compose.yml @@ -48,9 +48,7 @@ catalog: required: true type: enum options: - - php7.1-apache - - php7.2-apache - - php7.3-apache + - php7.3 - variable: "DATA_DIR" label: "Data Directory" From 59238d2c60fcb18884e9d0dac750271fa79b54aa Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 4 Jun 2019 13:59:10 -0400 Subject: [PATCH 16/19] First test config of sysPass --- templates/sysPass/0/README.md | 1 + templates/sysPass/0/docker-compose.yml | 58 +++++++++++++++++++++++++ templates/sysPass/0/rancher-compose.yml | 49 +++++++++++++++++++++ templates/sysPass/config.yml | 8 ++++ 4 files changed, 116 insertions(+) create mode 100644 templates/sysPass/0/README.md create mode 100644 templates/sysPass/0/docker-compose.yml create mode 100644 templates/sysPass/0/rancher-compose.yml create mode 100644 templates/sysPass/config.yml diff --git a/templates/sysPass/0/README.md b/templates/sysPass/0/README.md new file mode 100644 index 0000000..eced9de --- /dev/null +++ b/templates/sysPass/0/README.md @@ -0,0 +1 @@ +# sysPass \ No newline at end of file diff --git a/templates/sysPass/0/docker-compose.yml b/templates/sysPass/0/docker-compose.yml new file mode 100644 index 0000000..f288e73 --- /dev/null +++ b/templates/sysPass/0/docker-compose.yml @@ -0,0 +1,58 @@ +version: '2' + +services: + syspass: + image: syspass/syspass:3.0.5 + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 + 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: "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 + - /Rancher/${DATA_DIR}/Configuration:/var/www/html/sysPass/app/config # sysPass configuration files + - /Rancher/${DATA_DIR}/Backups:/var/www/html/sysPass/app/backup # sysPass backups + mysql: + image: mysql:5 + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 + environment: + MYSQL_DATABASE: syspass_db + MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} + MYSQL_USER: syspass_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 + - /Rancher/${DATA_DIR}/Database:/var/lib/mysql # MySQL database files diff --git a/templates/sysPass/0/rancher-compose.yml b/templates/sysPass/0/rancher-compose.yml new file mode 100644 index 0000000..5c6b3bc --- /dev/null +++ b/templates/sysPass/0/rancher-compose.yml @@ -0,0 +1,49 @@ +version: '2' +catalog: + name: sysPass + 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 "syspass_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/sysPass" + required: true + type: string \ No newline at end of file diff --git a/templates/sysPass/config.yml b/templates/sysPass/config.yml new file mode 100644 index 0000000..da454ce --- /dev/null +++ b/templates/sysPass/config.yml @@ -0,0 +1,8 @@ +name: sysPass +description: | + +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file From 8462bbb54a3b178a9373261bb712200b6a48a5a9 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 4 Jun 2019 14:03:27 -0400 Subject: [PATCH 17/19] Added website and documentation --- templates/sysPass/0/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/sysPass/0/README.md b/templates/sysPass/0/README.md index eced9de..acb2f8e 100644 --- a/templates/sysPass/0/README.md +++ b/templates/sysPass/0/README.md @@ -1 +1,5 @@ -# sysPass \ No newline at end of file +# sysPass + +[http://syspass.org/en] + +[https://doc.syspass.org/en/3.0/] \ No newline at end of file From 975b204080ed53862b0f24727c00052beb402d1f Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Tue, 4 Jun 2019 14:19:22 -0400 Subject: [PATCH 18/19] sysPass needs to create it's own database for some reason --- templates/sysPass/0/docker-compose.yml | 3 --- templates/sysPass/0/rancher-compose.yml | 8 -------- 2 files changed, 11 deletions(-) diff --git a/templates/sysPass/0/docker-compose.yml b/templates/sysPass/0/docker-compose.yml index f288e73..7e47a02 100644 --- a/templates/sysPass/0/docker-compose.yml +++ b/templates/sysPass/0/docker-compose.yml @@ -41,10 +41,7 @@ services: - 2606:4700:4700::1111 - 2606:4700:4700::1001 environment: - MYSQL_DATABASE: syspass_db MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} - MYSQL_USER: syspass_user - MYSQL_PASSWORD: ${DB_USER_PASS} labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}} diff --git a/templates/sysPass/0/rancher-compose.yml b/templates/sysPass/0/rancher-compose.yml index 5c6b3bc..9217820 100644 --- a/templates/sysPass/0/rancher-compose.yml +++ b/templates/sysPass/0/rancher-compose.yml @@ -32,14 +32,6 @@ catalog: required: true type: password - - variable: "DB_USER_PASS" - label: "Database User Password" - description: | - A secure password to be used by the "syspass_user" database user. - # default: - required: true - type: password - - variable: "DATA_DIR" label: "Data Directory" description: | From 3dff359dfad36e90678286dbce3ccf877144e6d7 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 9 Jun 2019 13:53:40 -0400 Subject: [PATCH 19/19] Added Mautic! --- Cool Stuff.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Cool Stuff.md b/Cool Stuff.md index 5941add..40dd7b5 100644 --- a/Cool Stuff.md +++ b/Cool Stuff.md @@ -46,6 +46,7 @@ [https://getcockpit.com/] [https://hub.docker.com/r/agentejo/cockpit] [https://hub.docker.com/r/homeassistant/home-assistant] + - Factorio - Eclipse Theia - Joomla @@ -54,7 +55,12 @@ - Mongo - Transmission - YOURLS -[https://www.silverstripe.com/] + + [https://www.silverstripe.com/] + +[https://www.mautic.org/](https://www.mautic.org/) + + ###### GitLab Runner