Skip to content

Commit

Permalink
refactor(build): improve err when file specified by -f does not exist
Browse files Browse the repository at this point in the history
When the user specifies a Containerfile or Dockfile with the -f flag in podman build, if the file does not exist, the error should be intuitive to the user.

Fixed: #22940

Signed-off-by: Kevin Cui <bh@bugs.cc>
  • Loading branch information
BlackHole1 committed Jun 18, 2024
1 parent afe55cd commit ee124b0
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 4 deletions.
24 changes: 20 additions & 4 deletions cmd/podman/common/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,7 @@ func ParseBuildOpts(cmd *cobra.Command, args []string, buildOpts *BuildFlagsWrap
// No context directory or URL was specified. Try to use the home of
// the first locally-available Containerfile.
for i := range containerFiles {
if strings.HasPrefix(containerFiles[i], "http://") ||
strings.HasPrefix(containerFiles[i], "https://") ||
strings.HasPrefix(containerFiles[i], "git://") ||
strings.HasPrefix(containerFiles[i], "github.com/") {
if isURL(containerFiles[i]) {
continue
}
absFile, err := filepath.Abs(containerFiles[i])
Expand Down Expand Up @@ -239,6 +236,18 @@ func ParseBuildOpts(cmd *cobra.Command, args []string, buildOpts *BuildFlagsWrap
default:
return nil, fmt.Errorf("no Containerfile or Dockerfile specified or found in context directory, %s: %w", contextDir, syscall.ENOENT)
}
} else {
for _, f := range containerFiles {
if isURL(f) || f == "/dev/stdin" {
continue
}
if !filepath.IsAbs(f) {
f = filepath.Join(contextDir, f)
}
if !utils.FileExists(f) {
return nil, fmt.Errorf("the specified Containerfile or Dockerfile does not exist, %s: %w", f, syscall.ENOENT)
}
}
}

var logFile *os.File
Expand Down Expand Up @@ -628,3 +637,10 @@ func parseDockerignore(ignoreFile string) ([]string, error) {
}
return excludes, nil
}

func isURL(s string) bool {
return strings.HasPrefix(s, "http://") ||
strings.HasPrefix(s, "https://") ||
strings.HasPrefix(s, "git://") ||
strings.HasPrefix(s, "github.com/")
}
22 changes: 22 additions & 0 deletions test/e2e/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,28 @@ var _ = Describe("Podman build", func() {
Expect(session).Should(ExitCleanly())
})

It("podman build with not found Containerfile or Dockerfile", func() {
cwd, err := os.Getwd()
Expect(err).ToNot(HaveOccurred())

targetPath := filepath.Join(podmanTest.TempDir, "notfound")
err = os.Mkdir(targetPath, 0755)
Expect(err).ToNot(HaveOccurred())

Expect(os.Chdir(targetPath)).To(Succeed())
defer func() {
Expect(os.Chdir(cwd)).To(Succeed())
}()

session := podmanTest.Podman([]string{"build", "."})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitWithError(125, "no Containerfile or Dockerfile specified or found in context director"))

session = podmanTest.Podman([]string{"build", "-f", "foo"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitWithError(125, "the specified Containerfile or Dockerfile does not exist"))
})

It("podman build with logfile", func() {
logfile := filepath.Join(podmanTest.TempDir, "logfile")
session := podmanTest.Podman([]string{"build", "--pull=never", "--tag", "test", "--logfile", logfile, "build/basicalpine"})
Expand Down

0 comments on commit ee124b0

Please sign in to comment.