diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-18 15:31:54 -0400 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-18 17:20:30 -0400 |
commit | 92b28a88d8bcd5aa50352ecaff844229df1cee59 (patch) | |
tree | b340ddc09d29ae2cf29cb83269bcb614d94a6a10 /vendor/github.com/projectatomic/buildah/bind/util.go | |
parent | c3a0874222784e8996dbc472b9ca893a80aff451 (diff) | |
download | podman-92b28a88d8bcd5aa50352ecaff844229df1cee59.tar.gz podman-92b28a88d8bcd5aa50352ecaff844229df1cee59.tar.bz2 podman-92b28a88d8bcd5aa50352ecaff844229df1cee59.zip |
Vendor in latest containers/buildah
Switch from projectatomic/buildah to containers/buildah
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/bind/util.go')
-rw-r--r-- | vendor/github.com/projectatomic/buildah/bind/util.go | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/vendor/github.com/projectatomic/buildah/bind/util.go b/vendor/github.com/projectatomic/buildah/bind/util.go deleted file mode 100644 index 4408c53bb..000000000 --- a/vendor/github.com/projectatomic/buildah/bind/util.go +++ /dev/null @@ -1,39 +0,0 @@ -package bind - -import ( - "github.com/opencontainers/runtime-spec/specs-go" - "github.com/projectatomic/buildah/util" -) - -const ( - // NoBindOption is an option which, if present in a Mount structure's - // options list, will cause SetupIntermediateMountNamespace to not - // redirect it through a bind mount. - NoBindOption = "nobuildahbind" -) - -func stripNoBindOption(spec *specs.Spec) { - for i := range spec.Mounts { - if util.StringInSlice(NoBindOption, spec.Mounts[i].Options) { - prunedOptions := make([]string, 0, len(spec.Mounts[i].Options)) - for _, option := range spec.Mounts[i].Options { - if option != NoBindOption { - prunedOptions = append(prunedOptions, option) - } - } - spec.Mounts[i].Options = prunedOptions - } - } -} - -func dedupeStringSlice(slice []string) []string { - done := make([]string, 0, len(slice)) - m := make(map[string]struct{}) - for _, s := range slice { - if _, present := m[s]; !present { - m[s] = struct{}{} - done = append(done, s) - } - } - return done -} |