summaryrefslogtreecommitdiff
path: root/vendor/github.com/projectatomic/buildah
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-08-16 16:23:09 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-17 11:40:46 +0000
commit57e1600315c3b4657797d2605cc69d7343da034f (patch)
tree93b75a75abd830dba091d82f17d87463b4d549fb /vendor/github.com/projectatomic/buildah
parent89a9750b6dd55b6d647d43942c6f97c9e1bb4029 (diff)
downloadpodman-57e1600315c3b4657797d2605cc69d7343da034f.tar.gz
podman-57e1600315c3b4657797d2605cc69d7343da034f.tar.bz2
podman-57e1600315c3b4657797d2605cc69d7343da034f.zip
Vendor in latest buildah and imagebuilder
We want to add the latest support for COPY --chown UID:GID. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1289 Approved by: TomSweeneyRedHat
Diffstat (limited to 'vendor/github.com/projectatomic/buildah')
-rw-r--r--vendor/github.com/projectatomic/buildah/imagebuildah/build.go7
-rw-r--r--vendor/github.com/projectatomic/buildah/vendor.conf5
2 files changed, 8 insertions, 4 deletions
diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go
index bcdcfb678..547b6b249 100644
--- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go
+++ b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go
@@ -446,7 +446,12 @@ func (b *Executor) Copy(excludes []string, copies ...imagebuilder.Copy) error {
sources = append(sources, filepath.Join(b.contextDir, src))
}
}
- if err := b.builder.Add(copy.Dest, copy.Download, buildah.AddAndCopyOptions{}, sources...); err != nil {
+
+ options := buildah.AddAndCopyOptions{
+ Chown: copy.Chown,
+ }
+
+ if err := b.builder.Add(copy.Dest, copy.Download, options, sources...); err != nil {
return err
}
}
diff --git a/vendor/github.com/projectatomic/buildah/vendor.conf b/vendor/github.com/projectatomic/buildah/vendor.conf
index 3fec2d1f1..cf9f1664e 100644
--- a/vendor/github.com/projectatomic/buildah/vendor.conf
+++ b/vendor/github.com/projectatomic/buildah/vendor.conf
@@ -2,7 +2,7 @@ github.com/Azure/go-ansiterm master
github.com/blang/semver master
github.com/BurntSushi/toml master
github.com/containerd/continuity master
-github.com/containernetworking/cni v0.6.0
+github.com/containernetworking/cni v0.7.0-alpha1
github.com/seccomp/containers-golang master
github.com/containers/image 216acb1bcd2c1abef736ee322e17147ee2b7d76c
github.com/containers/storage 17c7d1fee5603ccf6dd97edc14162fc1510e7e23
@@ -42,8 +42,7 @@ github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460
github.com/pborman/uuid master
github.com/pkg/errors master
github.com/pquerna/ffjson d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac
-github.com/containers/libpod master
-github.com/containers/libpod master
+github.com/containers/libpod d20f3a51463ce75d139dd830e19a173906b0b0cb
github.com/sirupsen/logrus master
github.com/syndtr/gocapability master
github.com/tchap/go-patricia master