opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12425 from tnk4on/remote-build-eval-containerfile

Browse Source 
Fixed the containerfile not found during remote build
This commit is contained in:
OpenShift Merge Robot
2021-12-02 10:30:48 +01:00
committed by GitHub
parent c70878603a 0ddb094480
commit eeb71490e5
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/bindings/images/build.go
View File

@ -346,6 +346,11 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
} }
c = tmpFile.Name() 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) containerfile, err := filepath.Abs(c)
if err != nil { if err != nil {
logrus.Errorf("Cannot find absolute path of %v: %v", c, err) logrus.Errorf("Cannot find absolute path of %v: %v", c, err)