Vendor in latest containers/buildah

Switch from projectatomic/buildah to containers/buildah

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2018-09-18 15:31:54 -04:00
parent c3a0874222
commit 92b28a88d8
60 changed files with 882 additions and 382 deletions

39
vendor/github.com/containers/buildah/bind/util.go generated vendored Normal file
View File

@ -0,0 +1,39 @@
package bind
import (
"github.com/containers/buildah/util"
"github.com/opencontainers/runtime-spec/specs-go"
)
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
}