From b4cf268db0d8d147f29121b99dd42b406a916bad Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 8 Oct 2020 11:47:18 +0000
Subject: [PATCH 1/2] Update build images

Incorporating changes from #3785 and #3819
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d52361d29..b3cf521e9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,12 +3,12 @@ version: 2
 defaults: &defaults
   working_directory: /go/src/github.com/weaveworks/scope
   docker:
-    - image: weaveworks/scope-backend-build:master-14d4ecc3
+    - image: weaveworks/scope-backend-build:master-22aa742b
 
 client-defaults: &client-defaults
   working_directory: /home/weave/scope
   docker:
-    - image: weaveworks/scope-ui-build:master-aee14088
+    - image: weaveworks/scope-ui-build:master-bf6af9cf
 
 workflows:
   version: 2

From 3d2a52f2fc0458f381de632de8fc27606382e446 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 8 Oct 2020 11:51:29 +0000
Subject: [PATCH 2/2] Fix up test for go1.14 change

---
 probe/cri/registry_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/probe/cri/registry_test.go b/probe/cri/registry_test.go
index 2c91a1684..1bdfbcaf4 100644
--- a/probe/cri/registry_test.go
+++ b/probe/cri/registry_test.go
@@ -13,7 +13,7 @@ var nonUnixSocketsTest = []struct {
 }{
 	{"http://xyz.com", "protocol \"http\" not supported"},
 	{"tcp://var/unix.sock", "endpoint was not unix socket tcp"},
-	{"http://[fe80::%31]/", "parse http://[fe80::%31]/: invalid URL escape \"%31\""},
+	{"http://[fe80::%31]/", "parse \"http://[fe80::%31]/\": invalid URL escape \"%31\""},
 }
 
 func TestParseNonUnixEndpointUrl(t *testing.T) {