From ca946f93226b73cf3ecd9f35936e6e95fdf6889e Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 11 Jun 2019 13:21:48 +0000
Subject: [PATCH] docs: Release 1.11.2

---
 CHANGELOG.md                                | 9 +++++++++
 examples/cri/deploy.yaml                    | 2 +-
 examples/cri/ds.yaml                        | 2 +-
 examples/docker/docker-compose-probe-v1.yml | 2 +-
 examples/docker/docker-compose-probe-v2.yml | 2 +-
 examples/k8s/deploy.yaml                    | 2 +-
 examples/k8s/ds.yaml                        | 2 +-
 examples/k8s/probe-deploy.yaml              | 2 +-
 examples/mesos/minimesos.json               | 2 +-
 site/installing.md                          | 4 ++--
 10 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb954c717..ccdb4286b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## Release 1.11.2
+
+Minor update:
+
+ - Updates to JavaScript dependencies, where security issues were reported:
+	[#3633](https://github.com/weaveworks/scope/pull/36233)
+ - Another fix for Scope not noticing when a container has been destroyed:
+	[#3627](https://github.com/weaveworks/scope/pull/3627)
+
 ## Release 1.11.1
 
 This release fixes a couple of bugs:
diff --git a/examples/cri/deploy.yaml b/examples/cri/deploy.yaml
index 7079fe6ee..d9dd59b33 100644
--- a/examples/cri/deploy.yaml
+++ b/examples/cri/deploy.yaml
@@ -25,7 +25,7 @@ spec:
           args:
             - '--no-probe'
           env: []
-          image: weaveworks/scope:1.11.1
+          image: weaveworks/scope:1.11.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 4040
diff --git a/examples/cri/ds.yaml b/examples/cri/ds.yaml
index 7aa1ad49a..6ac57a9ef 100644
--- a/examples/cri/ds.yaml
+++ b/examples/cri/ds.yaml
@@ -34,7 +34,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: weaveworks/scope:1.11.1
+          image: weaveworks/scope:1.11.2
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
diff --git a/examples/docker/docker-compose-probe-v1.yml b/examples/docker/docker-compose-probe-v1.yml
index ceaffab83..7e0e674c8 100644
--- a/examples/docker/docker-compose-probe-v1.yml
+++ b/examples/docker/docker-compose-probe-v1.yml
@@ -1,5 +1,5 @@
 probe:
-  image: weaveworks/scope:1.11.1
+  image: weaveworks/scope:1.11.2
   net: "host"
   pid: "host"
   privileged: true
diff --git a/examples/docker/docker-compose-probe-v2.yml b/examples/docker/docker-compose-probe-v2.yml
index deee1fa0b..e924329d2 100644
--- a/examples/docker/docker-compose-probe-v2.yml
+++ b/examples/docker/docker-compose-probe-v2.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   probe:
-    image: weaveworks/scope:1.11.1
+    image: weaveworks/scope:1.11.2
     network_mode: "host"
     pid: "host"
     privileged: true
diff --git a/examples/k8s/deploy.yaml b/examples/k8s/deploy.yaml
index 06c9155b4..971006040 100644
--- a/examples/k8s/deploy.yaml
+++ b/examples/k8s/deploy.yaml
@@ -28,7 +28,7 @@ spec:
           args:
             - '--no-probe'
           env: []
-          image: weaveworks/scope:1.11.1
+          image: weaveworks/scope:1.11.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 4040
diff --git a/examples/k8s/ds.yaml b/examples/k8s/ds.yaml
index 42b704871..5afe381e6 100644
--- a/examples/k8s/ds.yaml
+++ b/examples/k8s/ds.yaml
@@ -31,7 +31,7 @@ spec:
             - '--probe.docker.bridge=docker0'
             - '--probe.docker=true'
             - 'weave-scope-app.weave.svc.cluster.local.:80'
-          image: weaveworks/scope:1.11.1
+          image: weaveworks/scope:1.11.2
           imagePullPolicy: IfNotPresent
           resources:
             requests:
diff --git a/examples/k8s/probe-deploy.yaml b/examples/k8s/probe-deploy.yaml
index fedc8d58e..7c0fb58c4 100644
--- a/examples/k8s/probe-deploy.yaml
+++ b/examples/k8s/probe-deploy.yaml
@@ -35,7 +35,7 @@ spec:
             - 'weave-scope-app.weave.svc.cluster.local.:80'
           command:
             - /home/weave/scope
-          image: 'docker.io/weaveworks/scope:1.11.1'
+          image: 'docker.io/weaveworks/scope:1.11.2'
           imagePullPolicy: IfNotPresent
           resources:
             requests:
diff --git a/examples/mesos/minimesos.json b/examples/mesos/minimesos.json
index b661027aa..d5202c84a 100644
--- a/examples/mesos/minimesos.json
+++ b/examples/mesos/minimesos.json
@@ -12,7 +12,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "weaveworks/scope:1.11.1",
+      "image": "weaveworks/scope:1.11.2",
       "network": "HOST",
       "privileged": true,
       "parameters": [
diff --git a/site/installing.md b/site/installing.md
index 58de1f829..8b39dfce9 100644
--- a/site/installing.md
+++ b/site/installing.md
@@ -112,7 +112,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
 **Docker Compose Format Version 1:**
 
     scope:
-      image: weaveworks/scope:1.11.1
+      image: weaveworks/scope:1.11.2
       net: "host"
       pid: "host"
       privileged: true
@@ -128,7 +128,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
     version: '2'
     services:
       scope:
-        image: weaveworks/scope:1.11.1
+        image: weaveworks/scope:1.11.2
         network_mode: "host"
         pid: "host"
         privileged: true