aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShion Tanaka <shtanaka@redhat.com>2021-11-27 13:34:04 +0900
committerShion Tanaka <shtanaka@redhat.com>2021-11-30 21:13:43 +0900
commit0ddb094480e0dea132f1f81008baabd408bf1bdd (patch)
treef2d0127149ead9a6e2ab4bff7f2b10bc1ae0e674
parent7324d94648a9987b0de2dc95cf1b6fbc20592532 (diff)
downloadpodman-0ddb094480e0dea132f1f81008baabd408bf1bdd.tar.gz
podman-0ddb094480e0dea132f1f81008baabd408bf1bdd.tar.bz2
podman-0ddb094480e0dea132f1f81008baabd408bf1bdd.zip
Fixed the containerfile not found during remote build.
[NO NEW TESTS NEEDED] Signed-off-by: Shion Tanaka <shtanaka@redhat.com>
-rw-r--r--pkg/bindings/images/build.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 3b0bebe9f..107b10014 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -345,6 +345,11 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
}
c = tmpFile.Name()
}
+ 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)