From 0e91698d96b2381489053f72ee3cd544ec406e9c Mon Sep 17 00:00:00 2001
From: Kyle Sessions <thesheerice@gmail.com>
Date: Wed, 6 Dec 2017 19:20:33 -0700
Subject: [PATCH 1/2] Updated Weavescope to v1.6.5

---
 templates/weavescope/1/docker-compose.yml  | 24 ++++++++++++++++++++++
 templates/weavescope/1/rancher-compose.yml |  4 ++++
 templates/weavescope/config.yml            |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 templates/weavescope/1/docker-compose.yml
 create mode 100644 templates/weavescope/1/rancher-compose.yml

diff --git a/templates/weavescope/1/docker-compose.yml b/templates/weavescope/1/docker-compose.yml
new file mode 100644
index 0000000..28b73ad
--- /dev/null
+++ b/templates/weavescope/1/docker-compose.yml
@@ -0,0 +1,24 @@
+weavescope-probe:
+  image: weaveworks/scope:1.6.5
+  privileged: true
+  net: host
+  pid: host
+  labels:
+    io.rancher.scheduler.global: true
+    io.rancher.container.dns: true
+  links:
+  - weavescope-app
+  volumes:
+  - "/var/run/docker.sock:/var/run/docker.sock"
+  tty: true
+  command:
+  - "--probe.docker"
+  - "true"
+  - "--no-app"
+  - "weavescope-app"
+weavescope-app:
+  image: weaveworks/scope:1.6.5
+  ports:
+  - "4040:4040"
+  command:
+  - "--no-probe"
diff --git a/templates/weavescope/1/rancher-compose.yml b/templates/weavescope/1/rancher-compose.yml
new file mode 100644
index 0000000..623d341
--- /dev/null
+++ b/templates/weavescope/1/rancher-compose.yml
@@ -0,0 +1,4 @@
+.catalog:
+  name: weavescope
+  version: 1.6.5
+  description: "Monitoring, visualisation and management for Docker"
diff --git a/templates/weavescope/config.yml b/templates/weavescope/config.yml
index a06626d..36dee2b 100644
--- a/templates/weavescope/config.yml
+++ b/templates/weavescope/config.yml
@@ -1,6 +1,6 @@
 name: Weave Scope
 description: "Monitoring, visualisation and management for Docker"
-version: 1.1.0
+version: 1.6.5
 category: Monitoring
 maintainer: "Ilya Dmitrichenko <ilya@weave.works>"
 license: "Apache License v2.0"

From 5385581b10ad4b2bc9563f2882530ccf43d00b7f Mon Sep 17 00:00:00 2001
From: Kyle Sessions <thesheerice@gmail.com>
Date: Sat, 30 Dec 2017 10:40:45 -0700
Subject: [PATCH 2/2] Updated Weavescope to v1.6.7 Added Published port
 question

---
 templates/weavescope/1/docker-compose.yml  | 6 +++---
 templates/weavescope/1/rancher-compose.yml | 9 ++++++++-
 templates/weavescope/config.yml            | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/templates/weavescope/1/docker-compose.yml b/templates/weavescope/1/docker-compose.yml
index 28b73ad..ae76885 100644
--- a/templates/weavescope/1/docker-compose.yml
+++ b/templates/weavescope/1/docker-compose.yml
@@ -1,5 +1,5 @@
 weavescope-probe:
-  image: weaveworks/scope:1.6.5
+  image: weaveworks/scope:1.6.7
   privileged: true
   net: host
   pid: host
@@ -17,8 +17,8 @@ weavescope-probe:
   - "--no-app"
   - "weavescope-app"
 weavescope-app:
-  image: weaveworks/scope:1.6.5
+  image: weaveworks/scope:1.6.7
   ports:
-  - "4040:4040"
+  - "${PUBLISH_PORT}:4040"
   command:
   - "--no-probe"
diff --git a/templates/weavescope/1/rancher-compose.yml b/templates/weavescope/1/rancher-compose.yml
index 623d341..d66c9bc 100644
--- a/templates/weavescope/1/rancher-compose.yml
+++ b/templates/weavescope/1/rancher-compose.yml
@@ -1,4 +1,11 @@
 .catalog:
   name: weavescope
-  version: 1.6.5
+  version: 1.6.7
   description: "Monitoring, visualisation and management for Docker"
+  questions:
+    - variable: PUBLISH_PORT
+      label: "Published Port"
+      description: "public port to access the web"
+      default: "4040"
+      type: "int"
+      required: true
\ No newline at end of file
diff --git a/templates/weavescope/config.yml b/templates/weavescope/config.yml
index 36dee2b..3fe6b35 100644
--- a/templates/weavescope/config.yml
+++ b/templates/weavescope/config.yml
@@ -1,6 +1,6 @@
 name: Weave Scope
 description: "Monitoring, visualisation and management for Docker"
-version: 1.6.5
+version: 1.6.7
 category: Monitoring
 maintainer: "Ilya Dmitrichenko <ilya@weave.works>"
 license: "Apache License v2.0"