diff options
Diffstat (limited to 'vendor/github.com')
| -rw-r--r-- | vendor/github.com/containers/buildah/CHANGELOG.md | 3 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/add.go | 14 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/buildah.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/changelog.txt | 2 |
4 files changed, 17 insertions, 4 deletions
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 |