Update docker from a fork to fix a data race until the bugix has been…

… released officially (#778)
gravitational · Oct 10, 2019 · 0a2c0ae · 0a2c0ae
1 parent 3c6c560
commit 0a2c0ae
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -32,8 +32,7 @@ ignored = [
 
 [[override]]
   name = "github.com/gravitational/trace"
-  #version = "1.1.8"
-  revision = "3822600263648f166b2b2a14bc693e92947af68b"
+  version = "=1.1.8"
 
 [[override]]
   name = "github.com/mitchellh/go-ps"
@@ -138,7 +137,10 @@ ignored = [
 
 [[override]]
   name = "github.com/docker/docker"
-  revision = "be7ac8be2ae072032a4005e8f232be3fc57e4127"
+  source = "github.com/gravitational/moby"
+  # TODO(dmitri): update to release once the bugfix is tagged.
+  # See: https://github.com/moby/moby/issues/39859
+  revision = "2adf434ca69614dfc897dd0acf29018e5590a732"
 
 [[override]]
   name = "golang.org/x/sys"

diff --git a/vendor/github.com/docker/docker/pkg/archive/archive.go b/vendor/github.com/docker/docker/pkg/archive/archive.go
diff --git a/vendor/github.com/gravitational/trace/httplib.go b/vendor/github.com/gravitational/trace/httplib.go