3 files changed, 55 insertions, 27 deletions

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 3aca104e3..1029e03d1 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -135,6 +135,16 @@ func buildFlags(cmd *cobra.Command) {
 		logrus.Errorf("error setting up build flags: %v", err)
 		os.Exit(1)
 	}
+	// --http-proxy flag
+	// containers.conf defaults to true but we want to force false by default for remote, since settings do not apply
+	if registry.IsRemote() {
+		flag = fromAndBudFlags.Lookup("http-proxy")
+		buildOpts.HTTPProxy = false
+		if err := flag.Value.Set("false"); err != nil {
+			logrus.Errorf("unable to set --https-proxy to %v: %v", false, err)
+		}
+		flag.DefValue = "false"
+	}
 	flags.AddFlagSet(&fromAndBudFlags)
 	// Add the completion functions
 	fromAndBudFlagsCompletions := buildahCLI.GetFromAndBudFlagsCompletions()
@@ -394,7 +404,6 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 		AddCapabilities: flags.CapAdd,
 		AdditionalTags:  tags,
 		Annotations:     flags.Annotation,
-		Architecture:    flags.Arch,
 		Args:            args,
 		BlobDirectory:   flags.BlobCache,
 		CNIConfigDir:    flags.CNIConfigDir,
@@ -429,7 +438,6 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 		Layers:                  flags.Layers,
 		NamespaceOptions:        nsValues,
 		NoCache:                 flags.NoCache,
-		OS:                      flags.OS,
 		Out:                     stdout,
 		Output:                  output,
 		OutputFormat:            format,
diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go
index a24f46781..59fc6f54c 100644
--- a/cmd/podman/images/load.go
+++ b/cmd/podman/images/load.go
@@ -9,9 +9,8 @@ import (
 	"strings"
 
 	"github.com/containers/common/pkg/completion"
-	"github.com/containers/image/v5/docker/reference"
-	"github.com/containers/podman/v2/cmd/podman/parse"
 	"github.com/containers/podman/v2/cmd/podman/registry"
+	"github.com/containers/podman/v2/cmd/podman/validate"
 	"github.com/containers/podman/v2/pkg/domain/entities"
 	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
@@ -22,11 +21,11 @@ import (
 var (
 	loadDescription = "Loads an image from a locally stored archive (tar file) into container storage."
 	loadCommand     = &cobra.Command{
-		Use:               "load [options] [NAME[:TAG]]",
+		Use:               "load [options]",
 		Short:             "Load image(s) from a tar archive",
 		Long:              loadDescription,
 		RunE:              load,
-		Args:              cobra.MaximumNArgs(1),
+		Args:              validate.NoArgs,
 		ValidArgsFunction: completion.AutocompleteNone,
 	}
 
@@ -71,22 +70,8 @@ func loadFlags(cmd *cobra.Command) {
 }
 
 func load(cmd *cobra.Command, args []string) error {
-	if len(args) > 0 {
-		ref, err := reference.Parse(args[0])
-		if err != nil {
-			return err
-		}
-		if t, ok := ref.(reference.Tagged); ok {
-			loadOpts.Tag = t.Tag()
-		} else {
-			loadOpts.Tag = "latest"
-		}
-		if r, ok := ref.(reference.Named); ok {
-			loadOpts.Name = r.Name()
-		}
-	}
 	if len(loadOpts.Input) > 0 {
-		if err := parse.ValidateFileName(loadOpts.Input); err != nil {
+		if _, err := os.Stat(loadOpts.Input); err != nil {
 			return err
 		}
 	} else {
diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index c2ef7d767..c8ea4b04a 100644
--- a/cmd/podman/images/search.go
+++ b/cmd/podman/images/search.go
@@ -26,6 +26,12 @@ type searchOptionsWrapper struct {
 	Format       string // For go templating
 }
 
+// listEntryTag is a utility structure used for json serialization.
+type listEntryTag struct {
+	Name string
+	Tags []string
+}
+
 var (
 	searchOptions     = searchOptionsWrapper{}
 	searchDescription = `Search registries for a given image. Can search all the default registries or a specific registry.
@@ -149,14 +155,13 @@ func imageSearch(cmd *cobra.Command, args []string) error {
 		if len(searchOptions.Filters) != 0 {
 			return errors.Errorf("filters are not applicable to list tags result")
 		}
+		if report.IsJSON(searchOptions.Format) {
+			listTagsEntries := buildListTagsJson(searchReport)
+			return printJson(listTagsEntries)
+		}
 		row = "{{.Name}}\t{{.Tag}}\n"
 	case report.IsJSON(searchOptions.Format):
-		prettyJSON, err := json.MarshalIndent(searchReport, "", "    ")
-		if err != nil {
-			return err
-		}
-		fmt.Println(string(prettyJSON))
-		return nil
+		return printJson(searchReport)
 	case cmd.Flags().Changed("format"):
 		renderHeaders = parse.HasTable(searchOptions.Format)
 		row = report.NormalizeFormat(searchOptions.Format)
@@ -180,3 +185,33 @@ func imageSearch(cmd *cobra.Command, args []string) error {
 
 	return tmpl.Execute(w, searchReport)
 }
+
+func printJson(v interface{}) error {
+	prettyJSON, err := json.MarshalIndent(v, "", "    ")
+	if err != nil {
+		return err
+	}
+	fmt.Println(string(prettyJSON))
+	return nil
+}
+
+func buildListTagsJson(searchReport []entities.ImageSearchReport) []listEntryTag {
+	entries := []listEntryTag{}
+
+ReportLoop:
+	for _, report := range searchReport {
+		for idx, entry := range entries {
+			if entry.Name == report.Name {
+				entries[idx].Tags = append(entries[idx].Tags, report.Tag)
+				continue ReportLoop
+			}
+		}
+		newElem := listEntryTag{
+			report.Name,
+			[]string{report.Tag},
+		}
+
+		entries = append(entries, newElem)
+	}
+	return entries
+}