Merge pull request #7452 from jwhonce/issues/7136

Refactor API build endpoint to be more compliant
containers · Sep 15, 2020 · 3b4ad9a · 3b4ad9a
2 parents d5db2af + 146c68f
commit 3b4ad9a
Show file tree

Hide file tree

Showing 15 changed files with 478 additions and 378 deletions.
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
@@ -206,14 +206,9 @@ func build(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	ie, err := registry.NewImageEngine(cmd, args)
-	if err != nil {
-		return err
-	}
-
 	var logfile *os.File
 	if cmd.Flag("logfile").Changed {
-		logfile, err = os.OpenFile(buildOpts.Logfile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600)
+		logfile, err := os.OpenFile(buildOpts.Logfile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600)
 		if err != nil {
 			return errors.Errorf("error opening logfile %q: %v", buildOpts.Logfile, err)
 		}
@@ -225,7 +220,7 @@ func build(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	_, err = ie.Build(registry.GetContext(), containerFiles, *apiBuildOpts)
+	_, err = registry.ImageEngine().Build(registry.GetContext(), containerFiles, *apiBuildOpts)
 	return err
 }
 

diff --git a/cmd/podman/root.go b/cmd/podman/root.go
@@ -273,7 +273,6 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) {
 	pFlags.StringVar(&opts.RegistriesConf, "registries-conf", "", "Path to a registries.conf to use for image processing")
 	pFlags.StringVar(&opts.Runroot, "runroot", "", "Path to the 'run directory' where all state information is stored")
 	pFlags.StringVar(&opts.RuntimePath, "runtime", "", "Path to the OCI-compatible binary used to run containers, default is /usr/bin/runc")
-	pFlags.StringArrayVar(&opts.RuntimeFlags, "runtime-flag", []string{}, "add global flags for the container runtime")
 	// -s is deprecated due to conflict with -s on subcommands
 	pFlags.StringVar(&opts.StorageDriver, "storage-driver", "", "Select which storage driver is used to manage storage of images and containers (default is overlay)")
 	pFlags.StringArrayVar(&opts.StorageOpts, "storage-opt", []string{}, "Used to pass an option to the storage driver")
@@ -301,6 +300,7 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) {
 
 	// Only create these flags for ABI connections
 	if !registry.IsRemote() {
+		pFlags.StringArrayVar(&opts.RuntimeFlags, "runtime-flag", []string{}, "add global flags for the container runtime")
 		pFlags.BoolVar(&useSyslog, "syslog", false, "Output logging information to syslog as well as the console (default false)")
 	}
 }