summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-02-10 20:37:50 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2022-02-10 20:40:09 -0500
commit4966adddbb8890fdcdd542c3219469133b5583eb (patch)
treea2ce0973f859e208442b460bf849a998d328f3b4 /pkg
parent6d2b54a731cf5ac9a7e760709748ee96a636d65e (diff)
downloadpodman-4966adddbb8890fdcdd542c3219469133b5583eb.tar.gz
podman-4966adddbb8890fdcdd542c3219469133b5583eb.tar.bz2
podman-4966adddbb8890fdcdd542c3219469133b5583eb.zip
Make sure building with relative paths work correctly.
Fixes: https://github.com/containers/podman/issues/12763 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/bindings/images/build.go2
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)