From a360943a4837effc45e44333fe1ce4fdb1cdaee2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 14 Mar 2018 13:02:31 +0100 Subject: [PATCH] Fix golang.org/x/sync canonical import path The golang.org/x/sync package was vendored using the github.com/golang/sync URL, but this is not the canonical URL. Because of this, vendoring failed in Moby, as it detects these to be a duplicate import: vndr github.com/golang/sync 2018/03/14 11:54:37 Collecting initial packages 2018/03/14 11:55:00 Download dependencies 2018/03/14 11:55:00 Failed to parse config: invalid config format: // FIXME this should be golang.org/x/sync, which is already vendored above Signed-off-by: Sebastiaan van Stijn --- libnetwork/ipam/parallel_test.go | 3 +-- libnetwork/vendor.conf | 2 +- .../vendor/{github.com/golang => golang.org/x}/sync/LICENSE | 0 .../vendor/{github.com/golang => golang.org/x}/sync/PATENTS | 0 .../vendor/{github.com/golang => golang.org/x}/sync/README.md | 0 .../golang => golang.org/x}/sync/semaphore/semaphore.go | 0 6 files changed, 2 insertions(+), 3 deletions(-) rename libnetwork/vendor/{github.com/golang => golang.org/x}/sync/LICENSE (100%) rename libnetwork/vendor/{github.com/golang => golang.org/x}/sync/PATENTS (100%) rename libnetwork/vendor/{github.com/golang => golang.org/x}/sync/README.md (100%) rename libnetwork/vendor/{github.com/golang => golang.org/x}/sync/semaphore/semaphore.go (100%) diff --git a/libnetwork/ipam/parallel_test.go b/libnetwork/ipam/parallel_test.go index 7f9bc94661..1fa7bbf1ba 100644 --- a/libnetwork/ipam/parallel_test.go +++ b/libnetwork/ipam/parallel_test.go @@ -7,10 +7,9 @@ import ( "sync" "testing" - "github.com/golang/sync/semaphore" - "github.com/docker/libnetwork/ipamapi" "github.com/stretchr/testify/assert" + "golang.org/x/sync/semaphore" ) const ( diff --git a/libnetwork/vendor.conf b/libnetwork/vendor.conf index ba55d85e6c..3e7181564b 100644 --- a/libnetwork/vendor.conf +++ b/libnetwork/vendor.conf @@ -50,6 +50,6 @@ github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25 golang.org/x/crypto 558b6879de74bc843225cde5686419267ff707ca golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6 golang.org/x/sys 07c182904dbd53199946ba614a412c61d3c548f5 -github.com/golang/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5 +golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5 github.com/pkg/errors 839d9e913e063e28dfd0e6c7b7512793e0a48be9 github.com/ishidawataru/sctp 07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb diff --git a/libnetwork/vendor/github.com/golang/sync/LICENSE b/libnetwork/vendor/golang.org/x/sync/LICENSE similarity index 100% rename from libnetwork/vendor/github.com/golang/sync/LICENSE rename to libnetwork/vendor/golang.org/x/sync/LICENSE diff --git a/libnetwork/vendor/github.com/golang/sync/PATENTS b/libnetwork/vendor/golang.org/x/sync/PATENTS similarity index 100% rename from libnetwork/vendor/github.com/golang/sync/PATENTS rename to libnetwork/vendor/golang.org/x/sync/PATENTS diff --git a/libnetwork/vendor/github.com/golang/sync/README.md b/libnetwork/vendor/golang.org/x/sync/README.md similarity index 100% rename from libnetwork/vendor/github.com/golang/sync/README.md rename to libnetwork/vendor/golang.org/x/sync/README.md diff --git a/libnetwork/vendor/github.com/golang/sync/semaphore/semaphore.go b/libnetwork/vendor/golang.org/x/sync/semaphore/semaphore.go similarity index 100% rename from libnetwork/vendor/github.com/golang/sync/semaphore/semaphore.go rename to libnetwork/vendor/golang.org/x/sync/semaphore/semaphore.go