From 0d5c2118d38ef64be3807370c97cda929a4a4c2c Mon Sep 17 00:00:00 2001
From: Sander Kleykens <sander@kleykens.com>
Date: Sun, 20 Nov 2016 21:34:34 +0100
Subject: [PATCH] Bump Confluence up to v6.0.1

---
 templates/confluence/1/docker-compose.yml  | 13 ++++
 templates/confluence/1/rancher-compose.yml | 69 ++++++++++++++++++++++
 templates/confluence/config.yml            |  2 +-
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 templates/confluence/1/docker-compose.yml
 create mode 100644 templates/confluence/1/rancher-compose.yml

diff --git a/templates/confluence/1/docker-compose.yml b/templates/confluence/1/docker-compose.yml
new file mode 100644
index 0000000..3d3cd59
--- /dev/null
+++ b/templates/confluence/1/docker-compose.yml
@@ -0,0 +1,13 @@
+confluence:
+  image: sanderkleykens/confluence:6.0.1
+  restart: always
+  environment:
+    - CATALINA_OPTS=-Xms${heap_size} -Xmx${heap_size} ${jvm_args}
+    - CONFLUENCE_PROXY_PORT=${proxy_port}
+    - CONFLUENCE_PROXY_NAME=${proxy_name}
+    - CONFLUENCE_PROXY_SCHEME=${proxy_scheme}
+    - CONFLUENCE_CONTEXT_PATH=${context_path}
+  external_links:
+    - ${database_link}:database
+  volumes:
+    - ${confluence_home}:/var/atlassian/confluence
diff --git a/templates/confluence/1/rancher-compose.yml b/templates/confluence/1/rancher-compose.yml
new file mode 100644
index 0000000..b60a9b2
--- /dev/null
+++ b/templates/confluence/1/rancher-compose.yml
@@ -0,0 +1,69 @@
+.catalog:
+  name: "Confluence"
+  version: "6.0.1"
+  description: "Create, organize, and discuss work with your team"
+  questions:
+    - variable: "context_path"
+      label: "Context path"
+      description: |
+        The context path under which Confluence will be available
+      type: "string"
+      default: "/confluence"
+      required: true
+    - variable: "proxy_name"
+      label: "Proxy name"
+      description: |
+        When behind a proxy, specify the name through which clients will connect to Confluence. For example: confluence.mycompany.com
+      type: "string"
+      required: false
+    - variable: "proxy_port"
+      label: "Proxy port"
+      description: |
+        When behind a proxy, specify the port through which clients will connect to Confluence
+      type: "int"
+      required: false
+    - variable: "proxy_scheme"
+      label: "Proxy scheme"
+      description: |
+        When behind a proxy, specify the protocol clients will use to connect to Confluence
+      type: "enum"
+      options:
+        - http
+        - https
+      default: http
+      required: false
+    - variable: "heap_size"
+      label: "Heap size"
+      description: |
+        The size of the heap the JVM can allocate
+      type: "string"
+      default: "1024m"
+      required: true
+    - variable: "jvm_args"
+      label: "JVM arguments"
+      description: |
+        Additional arguments to pass to the JVM
+      type: "string"
+      required: false
+    - variable: "database_link"
+      label: "Database"
+      description: |
+        Service link to the database. This will be mapped to the container as 'database'
+      type: "service"
+      required: false
+    - variable: "confluence_home"
+      label: "Confluence home directory"
+      description: |
+        The location to mount the Confluence home directory on
+      type: "string"
+      required: true
+confluence:
+  scale: 1
+  health_check:
+    port: 8090
+    interval: 2000
+    initializing_timeout: 60000
+    unhealthy_threshold: 3
+    strategy: recreate
+    healthy_threshold: 2
+    response_timeout: 2000
diff --git a/templates/confluence/config.yml b/templates/confluence/config.yml
index e1d0af3..7f0f95a 100644
--- a/templates/confluence/config.yml
+++ b/templates/confluence/config.yml
@@ -1,5 +1,5 @@
 name: Confluence
 description: |
   Create, organize, and discuss work with your team
-version: 5.10.6
+version: 6.0.1
 category: Collaboration