From cdabb0f8f43739a3fa432a09a162c8d546dfe165 Mon Sep 17 00:00:00 2001
From: Raul Sanchez <rawmind@gmail.com>
Date: Tue, 1 Aug 2017 19:05:03 +0200
Subject: [PATCH] Updated gogs package. Solve issue #28

---
 templates/gogs/0/docker-compose.yml     | 14 ----
 templates/gogs/0/docker-compose.yml.tpl | 35 ++++++++++
 templates/gogs/0/rancher-compose.yml    | 87 +++++++++++++++++++++----
 templates/gogs/config.yml               |  2 +-
 4 files changed, 110 insertions(+), 28 deletions(-)
 delete mode 100644 templates/gogs/0/docker-compose.yml
 create mode 100644 templates/gogs/0/docker-compose.yml.tpl

diff --git a/templates/gogs/0/docker-compose.yml b/templates/gogs/0/docker-compose.yml
deleted file mode 100644
index cc95838..0000000
--- a/templates/gogs/0/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-gogs:
-    image: gogs/gogs:latest
-    ports:
-        - ${http_port}:3000
-        - ${ssh_port}:22
-    links:
-        - mysql:db
-
-mysql:
-    image: mysql:latest
-    ports:
-        - ${public_port}:3306
-    environment:
-        MYSQL_ROOT_PASSWORD: ${mysql_password}
diff --git a/templates/gogs/0/docker-compose.yml.tpl b/templates/gogs/0/docker-compose.yml.tpl
new file mode 100644
index 0000000..408f704
--- /dev/null
+++ b/templates/gogs/0/docker-compose.yml.tpl
@@ -0,0 +1,35 @@
+version: '2'
+services:
+  gogs:
+    image: gogs/gogs:0.11.19
+    volumes:
+      - gogs-data:/data/gogs
+{{- 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:
+      - gogs-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:
+  gogs-data:
+    driver: ${volume_driver}
+{{- if eq .Values.db_link ""}}
+  gogs-db:
+    driver: ${volume_driver}
+{{- end}}
+
diff --git a/templates/gogs/0/rancher-compose.yml b/templates/gogs/0/rancher-compose.yml
index b9cf7c4..697a011 100644
--- a/templates/gogs/0/rancher-compose.yml
+++ b/templates/gogs/0/rancher-compose.yml
@@ -1,33 +1,94 @@
-.catalog:
+version: '2'
+catalog:
   name: "Gogs"
-  version: "v0.8.43"
+  version: "v0.11.19"
   description: "A painless self-hosted Git service"
   uuid: gogs-0
   minimum_rancher_version: v0.51.0
   questions:
-    - variable: public_port
-      description: "public port to access the mysql server"
-      label: "Public Port"
-      required: true
-      default: "3306"
-      type: "int"
     - variable: http_port
       description: "http port to access gogs webui"
       label: "Http Port"
       required: true
-      default: "10080" 
+      default: "8080" 
       type: "int"
     - variable: ssh_port
       description: "ssh port to access gogs cli"
       label: "SSH Port"
       required: true
-      default: "222"
+      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: "gogs"
+      type: "string"
+    - variable: mysql_user
+      description: "mysql user"
+      label: "Mysql User"
+      required: true
+      default: "gogs"
+      type: "string"
     - variable: mysql_password
       description: "mysql root password"
       label: "Mysql Password"
       required: true
-      default: ""
+      default: "default_pass"
       type: "password"
-
-gogs:
+services:
+  gogs:
+    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: gogs
+        source_port: ${http_port}
+        target_port: 3000
+      - priority: 2
+        protocol: tcp
+        service: gogs
+        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/gogs/config.yml b/templates/gogs/config.yml
index be2e008..c675211 100644
--- a/templates/gogs/config.yml
+++ b/templates/gogs/config.yml
@@ -1,5 +1,5 @@
 name: Gogs
 description: |
     A painless self-hosted Git service
-version: v0.8.43
+version: v0.11.19
 category: Git