summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-23 13:12:52 +0000
committerGitHub <noreply@github.com>2020-09-23 13:12:52 +0000
commit3059bf8ef0877092c1b924cc1069ac9b3a1ebc2f (patch)
tree9a437213854aaa1ab40e440dccf18efba2f06517
parent7d273c40f5411df00666bd5d1ea1df5662a75517 (diff)
parente1270de308a0fc084ce502c52aa3d7a052c9e663 (diff)
downloadpodman-3059bf8ef0877092c1b924cc1069ac9b3a1ebc2f.tar.gz
podman-3059bf8ef0877092c1b924cc1069ac9b3a1ebc2f.tar.bz2
podman-3059bf8ef0877092c1b924cc1069ac9b3a1ebc2f.zip
Merge pull request #7743 from containers/dependabot/go_modules/github.com/containers/buildah-1.16.2
Bump github.com/containers/buildah from 1.16.1 to 1.16.2
-rw-r--r--go.mod2
-rw-r--r--go.sum4
-rw-r--r--vendor/github.com/containers/buildah/CHANGELOG.md3
-rw-r--r--vendor/github.com/containers/buildah/add.go14
-rw-r--r--vendor/github.com/containers/buildah/buildah.go2
-rw-r--r--vendor/github.com/containers/buildah/changelog.txt2
-rw-r--r--vendor/modules.txt2
7 files changed, 21 insertions, 8 deletions
diff --git a/go.mod b/go.mod
index 96128d4ca..9ef04fe28 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
github.com/containerd/containerd v1.4.1 // indirect
github.com/containernetworking/cni v0.8.0
github.com/containernetworking/plugins v0.8.7
- github.com/containers/buildah v1.16.1
+ github.com/containers/buildah v1.16.2
github.com/containers/common v0.22.0
github.com/containers/conmon v2.0.20+incompatible
github.com/containers/image/v5 v5.6.0
diff --git a/go.sum b/go.sum
index 90d2a1f7d..8f109a329 100644
--- a/go.sum
+++ b/go.sum
@@ -70,8 +70,8 @@ github.com/containernetworking/cni v0.8.0 h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjM
github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
github.com/containernetworking/plugins v0.8.7 h1:bU7QieuAp+sACI2vCzESJ3FoT860urYP+lThyZkb/2M=
github.com/containernetworking/plugins v0.8.7/go.mod h1:R7lXeZaBzpfqapcAbHRW8/CYwm0dHzbz0XEjofx0uB0=
-github.com/containers/buildah v1.16.1 h1:kxxZbW0in7cFv/AEQtSPNQ06aemYN5fsya31IS9xd2g=
-github.com/containers/buildah v1.16.1/go.mod h1:i1XqXgpCROnfcq4oNtfrFEk7UzNDxLJ/PZ+CnPyoIq8=
+github.com/containers/buildah v1.16.2 h1:u8RA0r9sp3d5df/QRm0glG7L6ZN40UVJcYedwcZGt8w=
+github.com/containers/buildah v1.16.2/go.mod h1:i1XqXgpCROnfcq4oNtfrFEk7UzNDxLJ/PZ+CnPyoIq8=
github.com/containers/common v0.21.0/go.mod h1:8w8SVwc+P2p1MOnRMbSKNWXt1Iwd2bKFu2LLZx55DTM=
github.com/containers/common v0.22.0 h1:MjJIMka4pJddHsfZpQCF7jOmX6vXqMs0ojDeYmPKoSk=
github.com/containers/common v0.22.0/go.mod h1:qsLcLHM7ha5Nc+JDp5duBwfwEfrnlfjXL/K8HO96QHw=
diff --git a/vendor/github.com/containers/buildah/CHANGELOG.md b/vendor/github.com/containers/buildah/CHANGELOG.md
index ecbd0540e..6168dc317 100644
--- a/vendor/github.com/containers/buildah/CHANGELOG.md
+++ b/vendor/github.com/containers/buildah/CHANGELOG.md
@@ -2,6 +2,9 @@
# Changelog
+## v1.16.2 (2020-09-21)
+ Add(): fix handling of relative paths with no ContextDir
+
## v1.16.1 (2020-09-10)
copier.Get(): hard link targets shouldn't be relative paths
diff --git a/vendor/github.com/containers/buildah/add.go b/vendor/github.com/containers/buildah/add.go
index 1c1f116da..bbfdda9c1 100644
--- a/vendor/github.com/containers/buildah/add.go
+++ b/vendor/github.com/containers/buildah/add.go
@@ -151,18 +151,26 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
}()
contextDir := options.ContextDir
- if contextDir == "" {
+ currentDir := options.ContextDir
+ if options.ContextDir == "" {
contextDir = string(os.PathSeparator)
+ currentDir, err = os.Getwd()
+ if err != nil {
+ return errors.Wrapf(err, "error determining current working directory")
+ }
}
// Figure out what sorts of sources we have.
var localSources, remoteSources []string
- for _, src := range sources {
+ for i, src := range sources {
if sourceIsRemote(src) {
remoteSources = append(remoteSources, src)
continue
}
- localSources = append(localSources, src)
+ if !filepath.IsAbs(src) && options.ContextDir == "" {
+ sources[i] = filepath.Join(currentDir, src)
+ }
+ localSources = append(localSources, sources[i])
}
// Check how many items our local source specs matched. Each spec
diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go
index d001b8a10..e63cfff3a 100644
--- a/vendor/github.com/containers/buildah/buildah.go
+++ b/vendor/github.com/containers/buildah/buildah.go
@@ -28,7 +28,7 @@ const (
Package = "buildah"
// Version for the Package. Bump version in contrib/rpm/buildah.spec
// too.
- Version = "1.16.1"
+ Version = "1.16.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/changelog.txt b/vendor/github.com/containers/buildah/changelog.txt
index ec5db6eac..d34ede417 100644
--- a/vendor/github.com/containers/buildah/changelog.txt
+++ b/vendor/github.com/containers/buildah/changelog.txt
@@ -1,3 +1,5 @@
+- Changelog for v1.16.2 (2020-09-21)
+ * Add(): fix handling of relative paths with no ContextDir
- Changelog for v1.16.1 (2020-09-10)
* copier.Get(): hard link targets shouldn't be relative paths
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 39ca1ff96..0d89425ab 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -67,7 +67,7 @@ github.com/containernetworking/plugins/pkg/utils/hwaddr
github.com/containernetworking/plugins/pkg/utils/sysctl
github.com/containernetworking/plugins/plugins/ipam/host-local/backend
github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator
-# github.com/containers/buildah v1.16.1
+# github.com/containers/buildah v1.16.2
github.com/containers/buildah
github.com/containers/buildah/bind
github.com/containers/buildah/chroot