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

Merge pull request #12853 from cdoern/buildRelative

Browse Source 
Podman Build use absolute filepath
This commit is contained in:
OpenShift Merge Robot
2022-01-14 13:12:16 +01:00
committed by GitHub
parent 482e0b11d9 bf3734ad53
commit 9686216f9d
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/images/build.go
View File

@ -257,6 +257,7 @@ func build(cmd *cobra.Command, args []string) 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] = absFile
break break
} }
} }
@ -289,7 +290,6 @@ func build(cmd *cobra.Command, args []string) error {
if err != nil { if err != nil {
return err return err
} }
report, err := registry.ImageEngine().Build(registry.GetContext(), containerFiles, *apiBuildOpts) report, err := registry.ImageEngine().Build(registry.GetContext(), containerFiles, *apiBuildOpts)
if err != nil { if err != nil {

15
test/e2e/build_test.go
View File

@ -691,4 +691,19 @@ RUN ls /dev/test1`, ALPINE)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
}) })
It("podman build use absolute path even if given relative", func() {
containerFile := fmt.Sprintf(`FROM %s`, ALPINE)
err = os.Mkdir("relative", 0755)
Expect(err).To(BeNil())
containerFilePath := filepath.Join("relative", "Containerfile")
fmt.Println(containerFilePath)
err = ioutil.WriteFile(containerFilePath, []byte(containerFile), 0755)
Expect(err).To(BeNil())
build := podmanTest.Podman([]string{"build", "-f", "./relative/Containerfile"})
build.WaitWithDefaultTimeout()
Expect(build).To(Exit(0))
err = os.RemoveAll("relative")
Expect(err).To(BeNil())
})
}) })