diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-29 12:32:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 12:32:08 -0700 |
| commit | c5ccab2dc4dc582e41aa81cddb7eb761715978b5 (patch) | |
| tree | 0e4914fa671b5f58b19114bb5cf22027963c5e0e | |
| parent | 053156534381ed394fa9e13a5c2f5e7115c6b6c7 (diff) | |
| parent | 1a0d4f260249c52c90bbc73526814782c3d9a17d (diff) | |
| download | podman-c5ccab2dc4dc582e41aa81cddb7eb761715978b5.tar.gz podman-c5ccab2dc4dc582e41aa81cddb7eb761715978b5.tar.bz2 podman-c5ccab2dc4dc582e41aa81cddb7eb761715978b5.zip | |
Merge pull request #2802 from TomSweeneyRedHat/dev/tsweeney/buildah1.7.2
Vendor Buildah 1.7.2
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/buildah.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/unshare/unshare.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vendor.conf b/vendor.conf index d36de6ffc..2adcb136c 100644 --- a/vendor.conf +++ b/vendor.conf @@ -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 diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go index febc3d0d1..9625fff96 100644 --- a/vendor/github.com/containers/buildah/buildah.go +++ b/vendor/github.com/containers/buildah/buildah.go @@ -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 diff --git a/vendor/github.com/containers/buildah/unshare/unshare.go b/vendor/github.com/containers/buildah/unshare/unshare.go index 91f4bb54a..77aee282f 100644 --- a/vendor/github.com/containers/buildah/unshare/unshare.go +++ b/vendor/github.com/containers/buildah/unshare/unshare.go @@ -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") } |