containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5080 from openSUSE/containerfile-context-fix 

Fix wrong Containerfile location on build
This commit is contained in:
OpenShift Merge Robot 2020-02-04 10:45:10 -08:00 committed by GitHub
parent 537352cc3e 59328a22db
commit b702134edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/build.go
View File

@ -234,10 +234,6 @@ func buildCmd(c *cliconfig.BuildValues) error {
return errors.Wrapf(err, "error determining path to file %q", containerfiles[i]) return errors.Wrapf(err, "error determining path to file %q", containerfiles[i])
} }
contextDir = filepath.Dir(absFile) contextDir = filepath.Dir(absFile)
containerfiles[i], err = filepath.Rel(contextDir, absFile)
if err != nil {
return errors.Wrapf(err, "error determining path to file %q", containerfiles[i])
}
break break
} }
} }