From 964649162598e3286142c27548e9871557c33912 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 30 Nov 2018 16:55:30 -0500 Subject: [PATCH 1/6] Added SSH capabilities for Traefik --- templates/Gogs/0/docker-compose.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/templates/Gogs/0/docker-compose.yml b/templates/Gogs/0/docker-compose.yml index 3de6c5a..dc9373c 100644 --- a/templates/Gogs/0/docker-compose.yml +++ b/templates/Gogs/0/docker-compose.yml @@ -16,13 +16,24 @@ services: {{- end}} {{- if .Values.TRAEFIK_HOST}} traefik.enable: true - traefik.frontend.rule: Host:${TRAEFIK_HOST} - traefik.frontend.entryPoints: http,https - traefik.frontend.headers.forceSTSHeader: true - traefik.frontend.headers.SSLRedirect: true - traefik.frontend.headers.STSPreload: true - traefik.frontend.headers.STSSeconds: 15552000 - traefik.port: "3000" + ### Start SSH Segment + traefik.ssh.frontend.entryPoints: ssh + traefik.ssh.frontend.headers.forceSTSHeader: true + traefik.ssh.frontend.headers.SSLRedirect: true + traefik.ssh.frontend.headers.STSPreload: true + traefik.ssh.frontend.headers.STSSeconds: 15552000 + traefik.ssh.frontend.rule: Host:${TRAEFIK_HOST} + traefik.ssh.port: "22" + ### End SSH Segment + ### Start Web Segment + traefik.web.frontend.entryPoints: http,https + traefik.web.frontend.headers.forceSTSHeader: true + 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: "3000" + ### End Web Segment {{- else}} traefik.enable: false {{- end}} From 1bf14e88f4b6dc2c65a146edf3814f6e3b3797ed Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 30 Nov 2018 17:34:47 -0500 Subject: [PATCH 2/6] Added ToDo list --- templates/Gogs/0/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/Gogs/0/README.md b/templates/Gogs/0/README.md index d5927ef..46738aa 100644 --- a/templates/Gogs/0/README.md +++ b/templates/Gogs/0/README.md @@ -1 +1,4 @@ -# Gogs \ No newline at end of file +# Gogs + +### ToDo List +* Add Redis or Memcache capabilities \ No newline at end of file From 0a860badfc4bfa91ff9f0b80caa51f6e4b9fa51f Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 1 Dec 2018 12:25:40 -0500 Subject: [PATCH 3/6] Added known issues --- templates/Gogs/0/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/Gogs/0/README.md b/templates/Gogs/0/README.md index 46738aa..e3f542a 100644 --- a/templates/Gogs/0/README.md +++ b/templates/Gogs/0/README.md @@ -1,4 +1,9 @@ # Gogs ### ToDo List -* Add Redis or Memcache capabilities \ No newline at end of file +* Add Redis or Memcache capabilities +* Add Slack integration +* Add Discord integration + +### Known Issues +* SSH capabilities not yet functional \ No newline at end of file From 95983f894e1d2e2e3f689866874b074f3a3f68fb Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 5 Dec 2018 22:32:56 -0500 Subject: [PATCH 4/6] Sync host timezone --- templates/Gogs/0/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/Gogs/0/docker-compose.yml b/templates/Gogs/0/docker-compose.yml index dc9373c..70ea7ad 100644 --- a/templates/Gogs/0/docker-compose.yml +++ b/templates/Gogs/0/docker-compose.yml @@ -64,6 +64,7 @@ services: {{- end}} restart: on-failure volumes: + - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql networks: From b6337f4004deb80786f1e6f3c8f3255dd59340f9 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 5 Dec 2018 22:44:09 -0500 Subject: [PATCH 5/6] Also sync time with host --- templates/Gogs/0/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/Gogs/0/docker-compose.yml b/templates/Gogs/0/docker-compose.yml index 70ea7ad..187bcff 100644 --- a/templates/Gogs/0/docker-compose.yml +++ b/templates/Gogs/0/docker-compose.yml @@ -64,6 +64,7 @@ services: {{- end}} restart: on-failure volumes: + - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql From 414bbf350741a0d95ef8ae9511f14371076997c5 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 18 Dec 2018 23:29:20 -0500 Subject: [PATCH 6/6] Minor updates, ready for master --- templates/Gogs/0/docker-compose.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/templates/Gogs/0/docker-compose.yml b/templates/Gogs/0/docker-compose.yml index 187bcff..7f454b1 100644 --- a/templates/Gogs/0/docker-compose.yml +++ b/templates/Gogs/0/docker-compose.yml @@ -46,14 +46,16 @@ services: - "${WEB_PORT}:3000" restart: on-failure volumes: - - /RancherCattleData/${DATA_DIR}/Data:/data + - /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:/data mysql: image: mysql:5 dns: - 1.1.1.1 - 1.0.0.1 environment: - MYSQL_DATABASE: gogs + MYSQL_DATABASE: gogs # Will eventually rename this to "gogs_db" MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} MYSQL_USER: gogs_user MYSQL_PASSWORD: ${DB_USER_PASS} @@ -62,12 +64,18 @@ services: {{- if .Values.HOST_LABEL}} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} + networks: + db-admin: + aliases: + - gogs restart: on-failure volumes: - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system - - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql + - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql networks: + db-admin: + external: true public-proxy: external: true \ No newline at end of file