summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShion Tanaka <shtanaka@redhat.com>2021-11-27 13:34:04 +0900
committerMatthew Heon <mheon@redhat.com>2021-12-06 15:44:14 -0500
commit658d133390120105cf673cd7dfe5d3436be29d38 (patch)
tree5079ccb57bb3976436110df4ed2ada515455e9f5
parentaa9799b81f4d24c965221ca762ab573e5eae75eb (diff)
downloadpodman-658d133390120105cf673cd7dfe5d3436be29d38.tar.gz
podman-658d133390120105cf673cd7dfe5d3436be29d38.tar.bz2
podman-658d133390120105cf673cd7dfe5d3436be29d38.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 4c3c83837..63cc508dc 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)