--runtime-load flag update to load the built image to multiple runtimes

Signed-off-by: Kyle Quest <kcq.public@gmail.com>

Author: kcq

pkg/app/master/command/imagebuild/cli.go

@@ -29,7 +29,7 @@ type CommandParams struct {
 	EngineNamespace    string                 `json:"engine_namespace,omitempty"`
 	ImageName          string                 `json:"image_name,omitempty"`
 	ImageArchiveFile   string                 `json:"image_archive_file,omitempty"`
-	Runtime            string                 `json:"runtime,omitempty"` //runtime where to load the created image
+	LoadRuntimes       []string               `json:"runtime,omitempty"` //runtime where to load the created image
 	Dockerfile         string                 `json:"dockerfile,omitempty"`
 	ContextDir         string                 `json:"context_dir,omitempty"`
 	BuildArgs          []imagebuilder.NVParam `json:"build_args,omitempty"`
@@ -71,7 +71,6 @@ var CLI = &cli.Command{
 			ImageArchiveFile:   ctx.String(FlagImageArchiveFile),
 			Dockerfile:         ctx.String(FlagDockerfile),
 			ContextDir:         ctx.String(FlagContextDir),
-			Runtime:            ctx.String(FlagRuntimeLoad),
 			Architecture:       ctx.String(FlagArchitecture),
 			BaseImage:          ctx.String(FlagBase),
 			BaseImageTar:       ctx.String(FlagBaseTar),
@@ -80,6 +79,17 @@ var CLI = &cli.Command{
 			Labels:             map[string]string{},
 		}
 
+		loadRuntimeSet := map[string]struct{}{}
+		for _, v := range ctx.StringSlice(FlagRuntimeLoad) {
+			if IsRuntimeValue(v) {
+				loadRuntimeSet[v] = struct{}{}
+			}
+		}
+
+		for k := range loadRuntimeSet {
+			cparams.LoadRuntimes = append(cparams.LoadRuntimes, k)
+		}
+
 		cboBuildArgs := command.ParseKVParams(ctx.StringSlice(FlagBuildArg))
 		for _, val := range cboBuildArgs {
 			cparams.BuildArgs = append(cparams.BuildArgs,

pkg/app/master/command/imagebuild/flags.go

@@ -108,6 +108,20 @@ type BuildEngineProps struct {
 	DefaultEndpoint       string
 }
 
+var Runtimes = map[string]struct{}{
+	NoneRuntimeLoad:   {},
+	DockerRuntimeLoad: {},
+	PodmanRuntimeLoad: {},
+}
+
+func IsRuntimeValue(name string) bool {
+	if _, ok := Runtimes[name]; ok {
+		return true
+	}
+
+	return false
+}
+
 var Architectures = map[string]struct{}{
 	Amd64Arch: {},
 	Arm64Arch: {},
@@ -200,9 +214,8 @@ var Flags = map[string]cli.Flag{
 		Usage:   FlagLabelUsage,
 		EnvVars: []string{"DSLIM_IMAGEBUILD_LABELS"},
 	},
-	FlagRuntimeLoad: &cli.StringFlag{
+	FlagRuntimeLoad: &cli.StringSliceFlag{
 		Name:    FlagRuntimeLoad,
-		Value:   DefaultRuntimeLoad,
 		Usage:   FlagRuntimeLoadUsage,
 		EnvVars: []string{"DSLIM_IMAGEBUILD_RUNTIME_LOAD"},
 	},

pkg/app/master/command/imagebuild/handle_engine_depot.go

@@ -26,8 +26,11 @@ func HandleDepotEngine(
 	ctx := context.Background()
 
 	var doLoad bool
-	if cparams.Runtime != NoneRuntimeLoad {
-		doLoad = true
+	for _, lrt := range cparams.LoadRuntimes {
+		if lrt != NoneRuntimeLoad {
+			doLoad = true
+			break
+		}
 	}
 
 	req := &cliv1.CreateBuildRequest{

pkg/app/master/command/imagebuild/handler.go

@@ -97,13 +97,9 @@ func OnCommand(
 		}
 	}
 
-	var isSame bool
 	switch cparams.Engine {
 	case DockerBuildEngine:
 		initDockerClient()
-		if cparams.Runtime == DockerRuntimeLoad {
-			isSame = true
-		}
 
 		if gparams.Debug {
 			version.Print(xc, cmdName, logger, dclient, false, gparams.InContainer, gparams.IsDSImage)
@@ -131,9 +127,6 @@ func OnCommand(
 		HandleSimpleEngine(logger, xc, gparams, cparams, dclient)
 	case PodmanBuildEngine:
 		initPodmanClient()
-		if cparams.Runtime == PodmanRuntimeLoad {
-			isSame = true
-		}
 
 		if gparams.Debug {
 			version.Print(xc, Name, logger, nil, false, gparams.InContainer, gparams.IsDSImage)
@@ -152,33 +145,38 @@ func OnCommand(
 		xc.Exit(-1)
 	}
 
-	var crtLoaderClient crt.ImageLoaderAPIClient
-	switch cparams.Runtime {
-	case DockerRuntimeLoad:
-		if dclient == nil {
-			initDockerClient()
-		}
+	crtLoaderClients := map[string]crt.ImageLoaderAPIClient{}
+	for _, v := range cparams.LoadRuntimes {
+		switch v {
+		case DockerRuntimeLoad:
+			if dclient == nil {
+				initDockerClient()
+			}
 
-		crtLoaderClient = dockercrtclient.New(dclient)
-	case PodmanRuntimeLoad:
-		if pclient == nil {
-			initPodmanClient()
-		}
+			crtLoaderClients[v] = dockercrtclient.New(dclient)
+		case PodmanRuntimeLoad:
+			if pclient == nil {
+				initPodmanClient()
+			}
 
-		crtLoaderClient = podmancrtclient.New(pclient)
+			crtLoaderClients[v] = podmancrtclient.New(pclient)
+		}
 	}
 
-	if crtLoaderClient != nil {
-		xc.Out.Info("runtime.load.image", ovars{
-			"runtime":            cparams.Runtime,
-			"image.archive.file": cparams.ImageArchiveFile,
-		})
+	if len(crtLoaderClients) > 0 {
+		for rt, client := range crtLoaderClients {
+			xc.Out.Info("runtime.load.image", ovars{
+				"runtime":            rt,
+				"image.archive.file": cparams.ImageArchiveFile,
+			})
 
-		if !isSame {
-			err = crtLoaderClient.LoadImage(cparams.ImageArchiveFile, os.Stdout)
-			xc.FailOn(err)
-		} else {
-			xc.Out.Info("same.image.engine.runtime")
+			if !((cparams.Engine == PodmanBuildEngine && rt == PodmanRuntimeLoad) ||
+				(cparams.Engine == DockerBuildEngine && rt == DockerRuntimeLoad)) {
+				err = client.LoadImage(cparams.ImageArchiveFile, os.Stdout)
+				xc.FailOn(err)
+			} else {
+				xc.Out.Info("same.image.engine.runtime")
+			}
 		}
 	} else {
 		xc.Out.Info("runtime.load.image.none")

pkg/crt/podman/podmanutil/podmanutil.go

@@ -130,7 +130,7 @@ func LoadImage(client context.Context,
 		return err
 	}
 
-	log.Errorf("podmanutil.LoadImage: images.Load() report = %+v", report)
+	log.Debugf("podmanutil.LoadImage: images.Load() report = %+v", report)
 	//todo: if outputStream != nil write report to it (report.Names)
 	return nil
 }

pkg/imagebuilder/simplebuilder/engine.go

@@ -30,6 +30,7 @@ const (
 	DefaultAppDir          = "/opt/app"
 	DefaultOutputImageName = "mint-built-image:latest"
 	BaseImageWithCerts     = "gcr.io/distroless/static-debian12:latest"
+	HistoryComment         = "mintoolkit"
 )
 
 // Engine is the default simple build engine
@@ -202,6 +203,7 @@ func (ref *Engine) Build(options imagebuilder.SimpleBuildOptions) (*imagebuilder
 				add.History = v1.History{
 					Created:   v1.Time{Time: time.Now()},
 					CreatedBy: fmt.Sprintf("COPY %s %s", layerInfo.Source, layerFilePath),
+					Comment:   HistoryComment,
 				}
 			}
 
@@ -228,6 +230,7 @@ func (ref *Engine) Build(options imagebuilder.SimpleBuildOptions) (*imagebuilder
 				add.History = v1.History{
 					Created:   v1.Time{Time: time.Now()},
 					CreatedBy: fmt.Sprintf("ADD %s /", layerInfo.Source),
+					Comment:   HistoryComment,
 				}
 			}
 
@@ -255,6 +258,7 @@ func (ref *Engine) Build(options imagebuilder.SimpleBuildOptions) (*imagebuilder
 				add.History = v1.History{
 					Created:   v1.Time{Time: time.Now()},
 					CreatedBy: fmt.Sprintf("COPY %s %s", layerInfo.Source, layerBasePath),
+					Comment:   HistoryComment,
 				}
 			}
 
@@ -349,7 +353,7 @@ func (ref *Engine) Build(options imagebuilder.SimpleBuildOptions) (*imagebuilder
 		return v1.History{
 			Created:    v1.Time{Time: time.Now()},
 			CreatedBy:  inst,
-			Comment:    "mintoolkit",
+			Comment:    HistoryComment,
 			EmptyLayer: true,
 		}
 	}