From 92b28a88d8bcd5aa50352ecaff844229df1cee59 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 18 Sep 2018 15:31:54 -0400
Subject: Vendor in latest containers/buildah

Switch from projectatomic/buildah to containers/buildah

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 .../github.com/projectatomic/buildah/bind/util.go  | 39 ----------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 vendor/github.com/projectatomic/buildah/bind/util.go

(limited to 'vendor/github.com/projectatomic/buildah/bind/util.go')

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
-}
-- 
cgit v1.2.3-54-g00ecf