Merge pull request #2625 from rhatdan/vendor

Update vendor of Buildah and imagebuilder
containers · Mar 13, 2019 · 8b3f759 · 8b3f759
2 parents 8b637bd + adad933
commit 8b3f759
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 59 deletions.
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go
@@ -259,7 +259,7 @@ func (r *LocalRuntime) Build(ctx context.Context, c *cliconfig.BuildValues, opti
 	if err != nil {
 		return errors.Wrapf(err, "error parsing namespace-related options")
 	}
-	usernsOption, idmappingOptions, err := parse.IDMappingOptions(c.PodmanCommand.Command)
+	usernsOption, idmappingOptions, err := parse.IDMappingOptions(c.PodmanCommand.Command, options.Isolation)
 	if err != nil {
 		return errors.Wrapf(err, "error parsing ID mapping options")
 	}

diff --git a/vendor.conf b/vendor.conf
@@ -93,13 +93,13 @@ k8s.io/apimachinery kubernetes-1.10.13-beta.0 https://github.com/kubernetes/apim
 k8s.io/client-go kubernetes-1.10.13-beta.0 https://github.com/kubernetes/client-go
 github.com/mrunalp/fileutils 7d4729fb36185a7c1719923406c9d40e54fb93c7
 github.com/varlink/go 3ac79db6fd6aec70924193b090962f92985fe199
-github.com/containers/buildah 345ffc2b29b4255a83cfa763db88799d8ec9c569 https://github.com/QiWang19/buildah
+github.com/containers/buildah 3ba8822d309128f7d76599432b8d9cdf77d4032f
 # TODO: Gotty has not been updated since 2012. Can we find replacement?
 github.com/Nvveen/Gotty cd527374f1e5bff4938207604a14f2e38a9cf512
 # do not go beyond the below commit as the next one requires a more recent
 # docker which is in conflict with openshift/imagebuilder
 github.com/fsouza/go-dockerclient 29c1814d12c072344bb91aac5d2ff719db39c523
-github.com/openshift/imagebuilder 36823496a6868f72bc36282cc475eb8a070c0934
+github.com/openshift/imagebuilder 705fe9255c57f8505efb9723a9ac4082b67973bc
 github.com/ulikunitz/xz v0.5.5
 github.com/coreos/go-iptables v0.4.0
 github.com/google/shlex c34317bd91bf98fab745d77b03933cf8769299fe

diff --git a/vendor/github.com/containers/buildah/imagebuildah/build.go b/vendor/github.com/containers/buildah/imagebuildah/build.go
diff --git a/vendor/github.com/containers/buildah/pkg/cli/common.go b/vendor/github.com/containers/buildah/pkg/cli/common.go
diff --git a/vendor/github.com/containers/buildah/pkg/parse/parse.go b/vendor/github.com/containers/buildah/pkg/parse/parse.go
diff --git a/vendor/github.com/containers/buildah/run.go b/vendor/github.com/containers/buildah/run.go
diff --git a/vendor/github.com/containers/buildah/vendor.conf b/vendor/github.com/containers/buildah/vendor.conf
diff --git a/vendor/github.com/openshift/imagebuilder/README.md b/vendor/github.com/openshift/imagebuilder/README.md
diff --git a/vendor/github.com/openshift/imagebuilder/builder.go b/vendor/github.com/openshift/imagebuilder/builder.go
diff --git a/vendor/github.com/openshift/imagebuilder/dockerfile/NOTICE b/vendor/github.com/openshift/imagebuilder/dockerfile/NOTICE
diff --git a/...ker/builder/dockerfile/command/command.go → ...magebuilder/dockerfile/command/command.go b/...ker/builder/dockerfile/command/command.go → ...magebuilder/dockerfile/command/command.go
diff --git a/...builder/dockerfile/parser/line_parsers.go → ...builder/dockerfile/parser/line_parsers.go b/...builder/dockerfile/parser/line_parsers.go → ...builder/dockerfile/parser/line_parsers.go
diff --git a/...ocker/builder/dockerfile/parser/parser.go → .../imagebuilder/dockerfile/parser/parser.go b/...ocker/builder/dockerfile/parser/parser.go → .../imagebuilder/dockerfile/parser/parser.go
diff --git a/...uilder/dockerfile/parser/split_command.go → ...uilder/dockerfile/parser/split_command.go b/...uilder/dockerfile/parser/split_command.go → ...uilder/dockerfile/parser/split_command.go
diff --git a/vendor/github.com/openshift/imagebuilder/evaluator.go b/vendor/github.com/openshift/imagebuilder/evaluator.go
diff --git a/vendor/github.com/openshift/imagebuilder/vendor.conf b/vendor/github.com/openshift/imagebuilder/vendor.conf