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

Merge pull request #4389 from TomSweeneyRedHat/dev/tsweeney/contextdir 

Validate contextdir on build
This commit is contained in:
Matthew Heon 2019-11-04 10:08:17 -05:00 committed by GitHub
parent efc7f1557b 677a0e5d60
commit 8e5aad97dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/build.go
View File

@ -238,6 +238,9 @@ func buildCmd(c *cliconfig.BuildValues) error {
if contextDir == "" { if contextDir == "" {
return errors.Errorf("no context directory specified, and no containerfile specified") return errors.Errorf("no context directory specified, and no containerfile specified")
} }
if !fileIsDir(contextDir) {
return errors.Errorf("context must be a directory: %v", contextDir)
}
if len(containerfiles) == 0 { if len(containerfiles) == 0 {
if checkIfFileExists(filepath.Join(contextDir, "Containerfile")) { if checkIfFileExists(filepath.Join(contextDir, "Containerfile")) {
containerfiles = append(containerfiles, filepath.Join(contextDir, "Containerfile")) containerfiles = append(containerfiles, filepath.Join(contextDir, "Containerfile"))

10
cmd/podman/utils.go
View File

@ -74,3 +74,13 @@ func checkIfFileExists(name string) bool {
} }
return !file.IsDir() return !file.IsDir()
} }
// Check if a file is or is not a directory
func fileIsDir(name string) bool {
file, err := os.Stat(name)
// All errors return file == nil
if err != nil {
return false
}
return file.IsDir()
}