1. docker
  2. Commit 996be00fb996e45c2f3e9e03dbc0c6ce555a0da5
Browse code

vendor: sort imports to prevent vendoring race condition

If both a "versioned" and "non-versioned" version of a dependency
exists in vendor.conf, the "longest" path should be cloned last,
otherwise the versioned dependency may be deleted when cloning its
non-versioned variant.

For example, with the following vendor.conf:

github.com/coreos/go-systemd/v22 v22.0.0
github.com/coreos/go-systemd v17

Running vndr would;

1. recursively delete "vendor/src/github.com/coreos/go-systemd/v22:
2. start cloning "github.com/coreos/go-systemd/v22"
3. recursively delete "vendor/src/github.com/coreos/go-systemd"
4. start cloning "github.com/coreos/go-systemd"

This would lead to a conflicting situation; step 3. will remove
the dependency that was previously cloned (or in the process
of being cloned).

This patch sorts the dependencies by import-path, cloning the
shortest import paths first, which should prevent the race condition.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2020/04/30 06:38:34
Showing 1 changed files
vendor.conf
History View file @ 996be00
... ... 
@@ -88,11 +88,12 @@ github.com/opencontainers/runtime-spec              29686dbc5559d93fb1ef402eeda3
88 88 
 github.com/opencontainers/image-spec                d60099175f88c47cd379c4738d158884749ed235 # v1.0.1
89 89 
 github.com/seccomp/libseccomp-golang                689e3c1541a84461afc49c1c87352a6cedf72e9c # v0.9.1
90 90
91 
+# go-systemd v17 is required by github.com/coreos/pkg/capnslog/journald_formatter.go
92 
+github.com/coreos/go-systemd                        39ca1b05acc7ad1220e09f133283b8859a8b71ab # v17
93 
+
91 94 
 # systemd integration (journald, daemon/listeners, containerd/cgroups)
92 95 
 github.com/coreos/go-systemd/v22                    2d78030078ef61b3cae27f42ad6d0e46db51b339 # v22.0.0
93 96 
 github.com/godbus/dbus/v5                           37bf87eef99d69c4f1d3528bd66e3a87dc201472 # v5.0.3
94 
-# go-systemd v17 is required by github.com/coreos/pkg/capnslog/journald_formatter.go
95 
-github.com/coreos/go-systemd                        39ca1b05acc7ad1220e09f133283b8859a8b71ab # v17
96 97
97 98 
 # gelf logging driver deps
98 99 
 github.com/Graylog2/go-gelf                         1550ee647df0510058c9d67a45c56f18911d80b8 # v2 branch