Merge pull request #2802 from TomSweeneyRedHat/dev/tsweeney/buildah1.7.2

Vendor Buildah 1.7.2
This commit is contained in:
OpenShift Merge Robot
2019-03-29 12:32:08 -07:00
committed by GitHub
3 changed files with 3 additions and 3 deletions

View File

@ -93,7 +93,7 @@ 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 c933fe4bc608676d308ffcb276b7d8561a18e94d
github.com/containers/buildah v1.7.2
# TODO: Gotty has not been updated since 2012. Can we find replacement?
github.com/Nvveen/Gotty cd527374f1e5bff4938207604a14f2e38a9cf512
github.com/fsouza/go-dockerclient v1.3.0

View File

@ -26,7 +26,7 @@ const (
Package = "buildah"
// Version for the Package. Bump version in contrib/rpm/buildah.spec
// too.
Version = "1.8-dev"
Version = "1.7.2"
// The value we use to identify what type of information, currently a
// serialized Builder structure, we are using as per-container state.
// This should only be changed when we make incompatible changes to

View File

@ -304,5 +304,5 @@ func GetRootlessUID() int {
// RootlessEnv returns the environment settings for the rootless containers
func RootlessEnv() []string {
return append(os.Environ(), UsernsEnvName+"=")
return append(os.Environ(), UsernsEnvName+"=done")
}