diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-11 12:08:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 12:08:59 -0500 |
| commit | 564404b4fa7eea5d93756627ce98ca68fd19a72b (patch) | |
| tree | 950cbfb6efe6694497ec32c39e75717f237799ff /pkg | |
| parent | 28ccb79b41553e31c5bf6e6460106f01f0317c6d (diff) | |
| parent | 4966adddbb8890fdcdd542c3219469133b5583eb (diff) | |
| download | podman-564404b4fa7eea5d93756627ce98ca68fd19a72b.tar.gz podman-564404b4fa7eea5d93756627ce98ca68fd19a72b.tar.bz2 podman-564404b4fa7eea5d93756627ce98ca68fd19a72b.zip | |
Merge pull request #13210 from rhatdan/build
Make sure building with relative paths work correctly.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/bindings/images/build.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index a363f2c6e..c508cb767 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -352,11 +352,13 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO } c = tmpFile.Name() } + c = filepath.Clean(c) cfDir := filepath.Dir(c) if absDir, err := filepath.EvalSymlinks(cfDir); err == nil { name := filepath.ToSlash(strings.TrimPrefix(c, cfDir+string(filepath.Separator))) c = filepath.Join(absDir, name) } + containerfile, err := filepath.Abs(c) if err != nil { logrus.Errorf("Cannot find absolute path of %v: %v", c, err) |