mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-08-07 01:15:44 +00:00
677a0e5d60
We never verified that the context directory passed into the build command was a valid directory. When we then slapped a default Containerfile name onto it, things went south fast if the user had passed us a file and not a directory. Fixes: #4383 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
86 lines
2 KiB
Go
86 lines
2 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"reflect"
|
|
"runtime/debug"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
// print results from CLI command
|
|
func printCmdResults(ok []string, failures map[string]error) error {
|
|
for _, id := range ok {
|
|
fmt.Println(id)
|
|
}
|
|
|
|
if len(failures) > 0 {
|
|
keys := reflect.ValueOf(failures).MapKeys()
|
|
lastKey := keys[len(keys)-1].String()
|
|
lastErr := failures[lastKey]
|
|
delete(failures, lastKey)
|
|
|
|
for _, err := range failures {
|
|
outputError(err)
|
|
}
|
|
return lastErr
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// markFlagHiddenForRemoteClient makes the flag not appear as part of the CLI
|
|
// on the remote-client
|
|
func markFlagHiddenForRemoteClient(flagName string, flags *pflag.FlagSet) {
|
|
if remoteclient {
|
|
if err := flags.MarkHidden(flagName); err != nil {
|
|
debug.PrintStack()
|
|
logrus.Errorf("unable to mark %s as hidden in the remote-client", flagName)
|
|
}
|
|
}
|
|
}
|
|
|
|
// markFlagHidden is a helper function to log an error if marking
|
|
// a flag as hidden happens to fail
|
|
func markFlagHidden(flags *pflag.FlagSet, flag string) {
|
|
if err := flags.MarkHidden(flag); err != nil {
|
|
logrus.Errorf("unable to mark flag '%s' as hidden: %q", flag, err)
|
|
}
|
|
}
|
|
|
|
func aliasFlags(f *pflag.FlagSet, name string) pflag.NormalizedName {
|
|
switch name {
|
|
case "healthcheck-command":
|
|
name = "health-cmd"
|
|
case "healthcheck-interval":
|
|
name = "health-interval"
|
|
case "healthcheck-retries":
|
|
name = "health-retries"
|
|
case "healthcheck-start-period":
|
|
name = "health-start-period"
|
|
case "healthcheck-timeout":
|
|
name = "health-timeout"
|
|
}
|
|
return pflag.NormalizedName(name)
|
|
}
|
|
|
|
// Check if a file exists and is not a directory
|
|
func checkIfFileExists(name string) bool {
|
|
file, err := os.Stat(name)
|
|
// All errors return file == nil
|
|
if err != nil {
|
|
return false
|
|
}
|
|
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()
|
|
}
|