From 5bfab01632eef2bc2eba443826cb79275b2b1457 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 22 Nov 2017 20:21:38 +0100 Subject: [PATCH 01/13] added gitea --- templates/gitea/0/docker-compose.yml.tpl | 35 +++++ templates/gitea/0/rancher-compose.yml | 94 +++++++++++++ templates/gitea/catalogIcon-gitea.svg | 160 +++++++++++++++++++++++ templates/gitea/config.yml | 5 + 4 files changed, 294 insertions(+) create mode 100644 templates/gitea/0/docker-compose.yml.tpl create mode 100644 templates/gitea/0/rancher-compose.yml create mode 100644 templates/gitea/catalogIcon-gitea.svg create mode 100644 templates/gitea/config.yml diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl new file mode 100644 index 0000000..0355a18 --- /dev/null +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -0,0 +1,35 @@ +version: '2' +services: + gitea: + image: gitea/gitea:1.3 + volumes: + - gitea-data:/data +{{- if ne .Values.db_link ""}} + external_links: + - ${db_link}:db +{{- else}} + links: + - db:db + db: + image: mysql:5.5 + environment: + MYSQL_ROOT_PASSWORD: ${mysql_password} + MYSQL_USER: ${mysql_user} + MYSQL_PASSWORD: ${mysql_password} + MYSQL_DATABASE: ${mysql_db} + volumes: + - gitea-db:/var/lib/mysql +{{- end}} + lb: + image: rancher/lb-service-haproxy:v0.6.4 + ports: + - ${http_port}:${http_port}/tcp + - ${ssh_port}:${ssh_port}/tcp +volumes: + gitea-data: + driver: ${volume_driver} +{{- if eq .Values.db_link ""}} + gitea-db: + driver: ${volume_driver} +{{- end}} + diff --git a/templates/gitea/0/rancher-compose.yml b/templates/gitea/0/rancher-compose.yml new file mode 100644 index 0000000..8b1c006 --- /dev/null +++ b/templates/gitea/0/rancher-compose.yml @@ -0,0 +1,94 @@ +version: '2' +catalog: + name: "Gitea" + version: "v0.11.19" + description: "A painless self-hosted Git service" + uuid: gitea-0 + minimum_rancher_version: v0.51.0 + questions: + - variable: http_port + description: "http port to access Gitea's webui" + label: "Http Port" + required: true + default: "8080" + type: "int" + - variable: ssh_port + description: "ssh port to clone repositories via ssh" + label: "SSH Port" + required: true + default: "2222" + type: "int" + - variable: "volume_driver" + description: "Volume driver to associate with this service" + label: "Volume Driver" + required: true + default: "local" + type: enum + options: # List of options if using type of `enum` + - local + - rancher-nfs + - rancher-efs + - rancher-ebs + - variable: "db_link" + description: | + DB external service link cluster. + label: "External db service" + default: "" + required: false + type: "service" + - variable: mysql_db + description: "mysql db" + label: "Mysql db" + required: true + default: "gitea" + type: "string" + - variable: mysql_user + description: "mysql user" + label: "Mysql User" + required: true + default: "gitea" + type: "string" + - variable: mysql_password + description: "mysql root password" + label: "Mysql Password" + required: true + default: "default_pass" + type: "password" +services: + gitea: + scale: 1 + retain_ip: true + health_check: + response_timeout: 2000 + healthy_threshold: 2 + port: 3000 + unhealthy_threshold: 3 + initializing_timeout: 300000 + interval: 2000 + strategy: recreate + request_line: GET "/" "HTTP/1.0" + reinitializing_timeout: 120000 + lb: + scale: 1 + start_on_create: true + lb_config: + certs: [] + port_rules: + - priority: 1 + protocol: http + service: gitea + source_port: ${http_port} + target_port: 3000 + - priority: 2 + protocol: tcp + service: gitea + source_port: ${ssh_port} + target_port: 22 + health_check: + response_timeout: 2000 + healthy_threshold: 2 + port: 42 + unhealthy_threshold: 3 + initializing_timeout: 60000 + interval: 2000 + reinitializing_timeout: 60000 diff --git a/templates/gitea/catalogIcon-gitea.svg b/templates/gitea/catalogIcon-gitea.svg new file mode 100644 index 0000000..ac1594a --- /dev/null +++ b/templates/gitea/catalogIcon-gitea.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/gitea/config.yml b/templates/gitea/config.yml new file mode 100644 index 0000000..fecfd1a --- /dev/null +++ b/templates/gitea/config.yml @@ -0,0 +1,5 @@ +name: Gitea +description: | + A painless self-hosted Git service +version: v1.3 +category: Git From f40c60d50284480a034ba2e152862645d944fd5d Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 22 Nov 2017 20:30:33 +0100 Subject: [PATCH 02/13] updated gitea config template --- templates/gitea/0/docker-compose.yml.tpl | 6 ++-- templates/gitea/0/rancher-compose.yml | 35 ++++++++---------------- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index 0355a18..82b3d2b 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -11,12 +11,10 @@ services: links: - db:db db: - image: mysql:5.5 + image: mariadb:10 environment: MYSQL_ROOT_PASSWORD: ${mysql_password} - MYSQL_USER: ${mysql_user} - MYSQL_PASSWORD: ${mysql_password} - MYSQL_DATABASE: ${mysql_db} + MYSQL_DATABASE: 'gitea' volumes: - gitea-db:/var/lib/mysql {{- end}} diff --git a/templates/gitea/0/rancher-compose.yml b/templates/gitea/0/rancher-compose.yml index 8b1c006..1048f8b 100644 --- a/templates/gitea/0/rancher-compose.yml +++ b/templates/gitea/0/rancher-compose.yml @@ -1,25 +1,25 @@ version: '2' catalog: name: "Gitea" - version: "v0.11.19" - description: "A painless self-hosted Git service" + version: "v1.3" + description: "A painless self-hosted Git service." uuid: gitea-0 minimum_rancher_version: v0.51.0 questions: - variable: http_port - description: "http port to access Gitea's webui" - label: "Http Port" + description: "Public HTTP port to access Gitea's webui." + label: "HTTP Port" required: true - default: "8080" + default: "3000" type: "int" - variable: ssh_port - description: "ssh port to clone repositories via ssh" + description: "Public ssh port to clone repositories via ssh." label: "SSH Port" required: true default: "2222" type: "int" - variable: "volume_driver" - description: "Volume driver to associate with this service" + description: "Volume driver to associate with this service." label: "Volume Driver" required: true default: "local" @@ -30,27 +30,14 @@ catalog: - rancher-efs - rancher-ebs - variable: "db_link" - description: | - DB external service link cluster. - label: "External db service" + description: "External DB service to use with gitea instead of its own DB-Container." + label: "External DB service" default: "" required: false type: "service" - - variable: mysql_db - description: "mysql db" - label: "Mysql db" - required: true - default: "gitea" - type: "string" - - variable: mysql_user - description: "mysql user" - label: "Mysql User" - required: true - default: "gitea" - type: "string" - variable: mysql_password - description: "mysql root password" - label: "Mysql Password" + description: "MySQL root password to use for Gitea." + label: "MySQL Password" required: true default: "default_pass" type: "password" From e060c0f1bd7222f50299d7f87201558397024b80 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 22 Nov 2017 21:01:18 +0100 Subject: [PATCH 03/13] updated gitea config template --- templates/gitea/0/docker-compose.yml.tpl | 2 +- templates/gitea/0/rancher-compose.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index 82b3d2b..9f53a85 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -19,7 +19,7 @@ services: - gitea-db:/var/lib/mysql {{- end}} lb: - image: rancher/lb-service-haproxy:v0.6.4 + image: rancher/lb-service-haproxy:v0.7.9 ports: - ${http_port}:${http_port}/tcp - ${ssh_port}:${ssh_port}/tcp diff --git a/templates/gitea/0/rancher-compose.yml b/templates/gitea/0/rancher-compose.yml index 1048f8b..f3f7a99 100644 --- a/templates/gitea/0/rancher-compose.yml +++ b/templates/gitea/0/rancher-compose.yml @@ -4,7 +4,8 @@ catalog: version: "v1.3" description: "A painless self-hosted Git service." uuid: gitea-0 - minimum_rancher_version: v0.51.0 + minimum_rancher_version: v0.56.0 + maintainer: "Konrad Langenberg " questions: - variable: http_port description: "Public HTTP port to access Gitea's webui." From 70f2a120381aca0f7db42ccb47a36d970be744b0 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 22 Nov 2017 21:01:37 +0100 Subject: [PATCH 04/13] added gitea readme --- templates/gitea/0/Readme.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 templates/gitea/0/Readme.md diff --git a/templates/gitea/0/Readme.md b/templates/gitea/0/Readme.md new file mode 100644 index 0000000..d0ba3c3 --- /dev/null +++ b/templates/gitea/0/Readme.md @@ -0,0 +1,18 @@ +# Gitea - Git with a cup of tea + +> A painless self-hosted Git service. + +Gitea is a community managed fork of Gogs, lightweight code hosting solution written in Go and published under the MIT license. + +## Installation + +Note the mysql-root password from below, you will need it during installation. + +When launching Gitea for the first time, you will greeted with an installer. You'll need to change two things: + +* The database settings: + * Username: `root` + * Password: the previously mentioned password + * Database: `gitea` + * Database Host: `db:3306` +* Change the public URL to the one you defined previously, this is needed to access Gitea's web UI. From 28484c26c2d1ffa16a2de0a27a657ab9fd97792f Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 22 Nov 2017 21:09:01 +0100 Subject: [PATCH 05/13] updated readme --- templates/gitea/0/Readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/gitea/0/Readme.md b/templates/gitea/0/Readme.md index d0ba3c3..7efe854 100644 --- a/templates/gitea/0/Readme.md +++ b/templates/gitea/0/Readme.md @@ -15,4 +15,6 @@ When launching Gitea for the first time, you will greeted with an installer. You * Password: the previously mentioned password * Database: `gitea` * Database Host: `db:3306` +* Change the domain name to the one you use to access Gitea +* Change the public ssh port to the one you defined earlier if you want to enable ssh * Change the public URL to the one you defined previously, this is needed to access Gitea's web UI. From 89915400bccc8b6cfba779d5429833e050b44aae Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 22 Nov 2017 21:26:11 +0100 Subject: [PATCH 06/13] updated gitea to rc --- templates/gitea/0/docker-compose.yml.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index 9f53a85..f8b8282 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -1,7 +1,7 @@ version: '2' services: gitea: - image: gitea/gitea:1.3 + image: gitea/gitea:1.3.0-rc1 volumes: - gitea-data:/data {{- if ne .Values.db_link ""}} From a51aca86ae0c5ef5aa9417d07c07d6fba9015e91 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 26 Nov 2017 14:52:52 +0100 Subject: [PATCH 07/13] updated config to fix running multiple containers with shared volumes --- templates/gitea/0/docker-compose.yml.tpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index f8b8282..92d617e 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -3,7 +3,13 @@ services: gitea: image: gitea/gitea:1.3.0-rc1 volumes: - - gitea-data:/data + - gitea-data/git:/data/git + - gitea-data/ssh:/data/ssh + - gitea-data/gitea/conf:/data/gitea/lfs + - gitea-data/gitea/lfs:/data/gitea/lfs + - gitea-data/gitea/log:/data/gitea/log + - gitea-data/gitea/sessions:/data/gitea/sessions + {{- if ne .Values.db_link ""}} external_links: - ${db_link}:db From a8a5c2be845f0944d4b8ca801c19e0400fd9c589 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 26 Nov 2017 14:57:17 +0100 Subject: [PATCH 08/13] updated config to fix running multiple containers with shared volumes fix --- templates/gitea/0/docker-compose.yml.tpl | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index 92d617e..0a9f9f2 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -3,12 +3,12 @@ services: gitea: image: gitea/gitea:1.3.0-rc1 volumes: - - gitea-data/git:/data/git - - gitea-data/ssh:/data/ssh - - gitea-data/gitea/conf:/data/gitea/lfs - - gitea-data/gitea/lfs:/data/gitea/lfs - - gitea-data/gitea/log:/data/gitea/log - - gitea-data/gitea/sessions:/data/gitea/sessions + - gitea-data-git:/data/git + - gitea-data-ssh:/data/ssh + - gitea-data-conf:/data/gitea/lfs + - gitea-data-lfs:/data/gitea/lfs + - gitea-data-log:/data/gitea/log + - gitea-data-sessions:/data/gitea/sessions {{- if ne .Values.db_link ""}} external_links: @@ -30,7 +30,17 @@ services: - ${http_port}:${http_port}/tcp - ${ssh_port}:${ssh_port}/tcp volumes: - gitea-data: + gitea-data-git: + driver: ${volume_driver} + gitea-data-ssh: + driver: ${volume_driver} + gitea-data-conf: + driver: ${volume_driver} + gitea-data-lfs: + driver: ${volume_driver} + gitea-data-log: + driver: ${volume_driver} + gitea-data-sessions: driver: ${volume_driver} {{- if eq .Values.db_link ""}} gitea-db: From 9783dbc89d36137f39d52269d103facfd0b09548 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 26 Nov 2017 16:42:45 +0100 Subject: [PATCH 09/13] fixed volumes --- templates/gitea/0/docker-compose.yml.tpl | 32 ++++++------------------ templates/gitea/0/rancher-compose.yml | 26 +++++++++++-------- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index 0a9f9f2..d2a1109 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -3,12 +3,12 @@ services: gitea: image: gitea/gitea:1.3.0-rc1 volumes: - - gitea-data-git:/data/git - - gitea-data-ssh:/data/ssh - - gitea-data-conf:/data/gitea/lfs - - gitea-data-lfs:/data/gitea/lfs - - gitea-data-log:/data/gitea/log - - gitea-data-sessions:/data/gitea/sessions + - ${data_path}/git:/data/git + - ${data_path}/ssh:/data/ssh + - ${data_path}/gitea/conf:/data/gitea/lfs + - ${data_path}/gitea/lfs:/data/gitea/lfs + - ${data_path}/gitea/log:/data/gitea/log + - ${data_path}/gitea/sessions:/data/gitea/sessions {{- if ne .Values.db_link ""}} external_links: @@ -22,28 +22,10 @@ services: MYSQL_ROOT_PASSWORD: ${mysql_password} MYSQL_DATABASE: 'gitea' volumes: - - gitea-db:/var/lib/mysql + - ${data_path}/gitea/db:/var/lib/mysql {{- end}} lb: image: rancher/lb-service-haproxy:v0.7.9 ports: - ${http_port}:${http_port}/tcp - ${ssh_port}:${ssh_port}/tcp -volumes: - gitea-data-git: - driver: ${volume_driver} - gitea-data-ssh: - driver: ${volume_driver} - gitea-data-conf: - driver: ${volume_driver} - gitea-data-lfs: - driver: ${volume_driver} - gitea-data-log: - driver: ${volume_driver} - gitea-data-sessions: - driver: ${volume_driver} -{{- if eq .Values.db_link ""}} - gitea-db: - driver: ${volume_driver} -{{- end}} - diff --git a/templates/gitea/0/rancher-compose.yml b/templates/gitea/0/rancher-compose.yml index f3f7a99..c1d83b0 100644 --- a/templates/gitea/0/rancher-compose.yml +++ b/templates/gitea/0/rancher-compose.yml @@ -19,17 +19,23 @@ catalog: required: true default: "2222" type: "int" - - variable: "volume_driver" - description: "Volume driver to associate with this service." - label: "Volume Driver" + - variable: data_path + description: "Path where to store the data of the Gitea-instance." + label: "Data path" required: true - default: "local" - type: enum - options: # List of options if using type of `enum` - - local - - rancher-nfs - - rancher-efs - - rancher-ebs + default: "/var/lib/gitea" + type: "string" +# - variable: "volume_driver" +# description: "Volume driver to associate with this service." +# label: "Volume Driver" +# required: true +# default: "local" +# type: enum +# options: # List of options if using type of `enum` +# - local +# - rancher-nfs +# - rancher-efs +# - rancher-ebs - variable: "db_link" description: "External DB service to use with gitea instead of its own DB-Container." label: "External DB service" From d1917df761201dac20835b527513fb68be08c0a4 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 26 Nov 2017 16:44:47 +0100 Subject: [PATCH 10/13] fixed volumes --- templates/gitea/0/docker-compose.yml.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index d2a1109..0ae675e 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -5,7 +5,7 @@ services: volumes: - ${data_path}/git:/data/git - ${data_path}/ssh:/data/ssh - - ${data_path}/gitea/conf:/data/gitea/lfs + - ${data_path}/gitea/conf:/data/gitea/conf - ${data_path}/gitea/lfs:/data/gitea/lfs - ${data_path}/gitea/log:/data/gitea/log - ${data_path}/gitea/sessions:/data/gitea/sessions From b80d13b46f809cd847490517989edd2e5aea900c Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 26 Nov 2017 17:42:02 +0100 Subject: [PATCH 11/13] fixed volums --- templates/gitea/0/docker-compose.yml.tpl | 32 ++++++++++++++++++------ templates/gitea/0/rancher-compose.yml | 32 ++++++++++++------------ 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index 0ae675e..2f0a71c 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -3,12 +3,12 @@ services: gitea: image: gitea/gitea:1.3.0-rc1 volumes: - - ${data_path}/git:/data/git - - ${data_path}/ssh:/data/ssh - - ${data_path}/gitea/conf:/data/gitea/conf - - ${data_path}/gitea/lfs:/data/gitea/lfs - - ${data_path}/gitea/log:/data/gitea/log - - ${data_path}/gitea/sessions:/data/gitea/sessions + - gitea-data-git:/data/git + - gitea-data-ssh:/data/ssh + - gitea-data-conf:/data/gitea/conf + - gitea-data-lfs:/data/gitea/lfs + - gitea-data-log:/data/gitea/log + - gitea-data-sessions:/data/gitea/sessions {{- if ne .Values.db_link ""}} external_links: @@ -22,10 +22,28 @@ services: MYSQL_ROOT_PASSWORD: ${mysql_password} MYSQL_DATABASE: 'gitea' volumes: - - ${data_path}/gitea/db:/var/lib/mysql + - gitea-db:/var/lib/mysql {{- end}} lb: image: rancher/lb-service-haproxy:v0.7.9 ports: - ${http_port}:${http_port}/tcp - ${ssh_port}:${ssh_port}/tcp +volumes: + gitea-data-git: + driver: ${volume_driver} + gitea-data-ssh: + driver: ${volume_driver} + gitea-data-conf: + driver: ${volume_driver} + gitea-data-lfs: + driver: ${volume_driver} + gitea-data-log: + driver: ${volume_driver} + gitea-data-sessions: + driver: ${volume_driver} +{{- if eq .Values.db_link ""}} + gitea-db: + driver: ${volume_driver} +{{- end}} + diff --git a/templates/gitea/0/rancher-compose.yml b/templates/gitea/0/rancher-compose.yml index c1d83b0..475a32f 100644 --- a/templates/gitea/0/rancher-compose.yml +++ b/templates/gitea/0/rancher-compose.yml @@ -19,23 +19,23 @@ catalog: required: true default: "2222" type: "int" - - variable: data_path - description: "Path where to store the data of the Gitea-instance." - label: "Data path" - required: true - default: "/var/lib/gitea" - type: "string" -# - variable: "volume_driver" -# description: "Volume driver to associate with this service." -# label: "Volume Driver" +# - variable: data_path +# description: "Path where to store the data of the Gitea-instance." +# label: "Data path" # required: true -# default: "local" -# type: enum -# options: # List of options if using type of `enum` -# - local -# - rancher-nfs -# - rancher-efs -# - rancher-ebs +# default: "/var/lib/gitea" +# type: "string" + - variable: "volume_driver" + description: "Volume driver to associate with this service." + label: "Volume Driver" + required: true + default: "local" + type: enum + options: # List of options if using type of `enum` + - local + - rancher-nfs + - rancher-efs + - rancher-ebs - variable: "db_link" description: "External DB service to use with gitea instead of its own DB-Container." label: "External DB service" From c265f8c0a69506a8efc343c0d1a82e9aee127d70 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 26 Nov 2017 17:51:02 +0100 Subject: [PATCH 12/13] resetted volumes --- templates/gitea/0/docker-compose.yml.tpl | 19 ++----------------- templates/gitea/0/rancher-compose.yml | 6 ------ 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index 2f0a71c..f61da61 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -3,12 +3,7 @@ services: gitea: image: gitea/gitea:1.3.0-rc1 volumes: - - gitea-data-git:/data/git - - gitea-data-ssh:/data/ssh - - gitea-data-conf:/data/gitea/conf - - gitea-data-lfs:/data/gitea/lfs - - gitea-data-log:/data/gitea/log - - gitea-data-sessions:/data/gitea/sessions + - gitea-data:/data {{- if ne .Values.db_link ""}} external_links: @@ -30,17 +25,7 @@ services: - ${http_port}:${http_port}/tcp - ${ssh_port}:${ssh_port}/tcp volumes: - gitea-data-git: - driver: ${volume_driver} - gitea-data-ssh: - driver: ${volume_driver} - gitea-data-conf: - driver: ${volume_driver} - gitea-data-lfs: - driver: ${volume_driver} - gitea-data-log: - driver: ${volume_driver} - gitea-data-sessions: + gitea-data: driver: ${volume_driver} {{- if eq .Values.db_link ""}} gitea-db: diff --git a/templates/gitea/0/rancher-compose.yml b/templates/gitea/0/rancher-compose.yml index 475a32f..f3f7a99 100644 --- a/templates/gitea/0/rancher-compose.yml +++ b/templates/gitea/0/rancher-compose.yml @@ -19,12 +19,6 @@ catalog: required: true default: "2222" type: "int" -# - variable: data_path -# description: "Path where to store the data of the Gitea-instance." -# label: "Data path" -# required: true -# default: "/var/lib/gitea" -# type: "string" - variable: "volume_driver" description: "Volume driver to associate with this service." label: "Volume Driver" From a9f591e67624dddb4e2455c4efadaada31f6a62f Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 3 Dec 2017 16:25:14 +0100 Subject: [PATCH 13/13] updated gitea to 1.3.0 --- templates/gitea/0/docker-compose.yml.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/gitea/0/docker-compose.yml.tpl b/templates/gitea/0/docker-compose.yml.tpl index f61da61..6b4533e 100644 --- a/templates/gitea/0/docker-compose.yml.tpl +++ b/templates/gitea/0/docker-compose.yml.tpl @@ -1,7 +1,7 @@ version: '2' services: gitea: - image: gitea/gitea:1.3.0-rc1 + image: gitea/gitea:1.3.0 volumes: - gitea-data:/data