registry ops refactoring and adding ability to push newly built images by the imagebuild command

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

Author: kcq

README.md

@@ -636,6 +636,10 @@ Flags:
 - `--base-tar` - `simple` build engine: base image from a local tar file
 - `--base-with-certs` - `simple` build engine: boolean flat to use the static-debian12 distroless base image - contains only certs and timezone info
 - `--exe-path` - `simple` build engine: local (linux) executable file that will be used as the entrypoint for the new image (added to the selected base image or scratch image if no base image is provided)
+- `--registry-push` - Push the built image to a container registry
+- `--use-docker-credentials` - Use the registry credentials from the default Docker config file (defaults to true).
+- `--account` - Registry credentials account.
+- `--secret` - Registry credentials secret.
 
 
 Examples:
@@ -717,7 +721,7 @@ There's also a placeholder for `copy`, but it doesn't do anything yet. Great opp
 
 Shared Command Level Flags:
 
-- `--use-docker-credentials` - Use the registry credentials from the default Docker config file.
+- `--use-docker-credentials` - Use the registry credentials from the default Docker config file (defaults to true).
 - `--account` - Registry credentials account.
 - `--secret` - Registry credentials secret.
 

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

@@ -11,6 +11,7 @@ import (
 
 	"github.com/mintoolkit/mint/pkg/app"
 	"github.com/mintoolkit/mint/pkg/app/master/command"
+	registrycmd "github.com/mintoolkit/mint/pkg/app/master/command/registry"
 	cmd "github.com/mintoolkit/mint/pkg/command"
 	"github.com/mintoolkit/mint/pkg/imagebuilder"
 	"github.com/mintoolkit/mint/pkg/util/fsutil"
@@ -30,6 +31,7 @@ type CommandParams struct {
 	ImageName          string                 `json:"image_name,omitempty"`
 	ImageArchiveFile   string                 `json:"image_archive_file,omitempty"`
 	LoadRuntimes       []string               `json:"runtime,omitempty"` //runtime where to load the created image
+	RegistryPush       bool                   `json:"registry_push,omitempty"`
 	Dockerfile         string                 `json:"dockerfile,omitempty"`
 	ContextDir         string                 `json:"context_dir,omitempty"`
 	BuildArgs          []imagebuilder.NVParam `json:"build_args,omitempty"`
@@ -39,6 +41,9 @@ type CommandParams struct {
 	BaseImageTar       string                 `json:"base_image_tar,omitempty"`
 	BaseImageWithCerts bool                   `json:"base_image_with_certs,omitempty"`
 	ExePath            string                 `json:"exe_path,omitempty"`
+	UseDockerCreds     bool                   `json:"use_docker_creds,omitempty"`
+	CredsAccount       string                 `json:"creds_account,omitempty"`
+	CredsSecret        string                 `json:"creds_secret,omitempty"`
 }
 
 var ImageBuildFlags = useAllFlags()
@@ -47,7 +52,11 @@ var CLI = &cli.Command{
 	Name:    Name,
 	Aliases: []string{Alias},
 	Usage:   Usage,
-	Flags:   ImageBuildFlags,
+	Flags: append(ImageBuildFlags,
+		registrycmd.Cflag(registrycmd.FlagUseDockerCreds),
+		registrycmd.Cflag(registrycmd.FlagCredsAccount),
+		registrycmd.Cflag(registrycmd.FlagCredsSecret),
+	),
 	Action: func(ctx *cli.Context) error {
 		logger := log.WithFields(log.Fields{"app": command.AppName, "cmd": Name, "op": "cli.Action"})
 
@@ -77,6 +86,10 @@ var CLI = &cli.Command{
 			BaseImageWithCerts: ctx.Bool(FlagBaseWithCerts),
 			ExePath:            ctx.String(FlagExePath),
 			Labels:             map[string]string{},
+			RegistryPush:       ctx.Bool(FlagRegistryPush),
+			UseDockerCreds:     ctx.Bool(registrycmd.FlagUseDockerCreds),
+			CredsAccount:       ctx.String(registrycmd.FlagCredsAccount),
+			CredsSecret:        ctx.String(registrycmd.FlagCredsSecret),
 		}
 
 		loadRuntimeSet := map[string]struct{}{}

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

@@ -9,6 +9,9 @@ import (
 
 // ImageBuild command flag names and usage descriptions
 const (
+	FlagRegistryPush      = "registry-push"
+	FlagRegistryPushUsage = "Push the built image to a container registry"
+
 	FlagRuntimeLoad      = "runtime-load"
 	FlagRuntimeLoadUsage = "container runtime where to load to created image"
 
@@ -248,6 +251,12 @@ var Flags = map[string]cli.Flag{
 		Usage:   FlagExePathUsage,
 		EnvVars: []string{"DSLIM_IMAGEBUILD_EXE_PATH"},
 	},
+	FlagRegistryPush: &cli.BoolFlag{
+		Name:    FlagRegistryPush,
+		Value:   false,
+		Usage:   FlagRegistryPushUsage,
+		EnvVars: []string{"DSLIM_IMAGEBUILD_REGISTRY_PUSH"},
+	},
 }
 
 func cflag(name string) cli.Flag {

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

@@ -5,6 +5,8 @@ import (
 	"os"
 
 	docker "github.com/fsouza/go-dockerclient"
+	"github.com/google/go-containerregistry/pkg/name"
+	"github.com/google/go-containerregistry/pkg/v1/remote"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/mintoolkit/mint/pkg/app"
@@ -17,6 +19,7 @@ import (
 	"github.com/mintoolkit/mint/pkg/crt/docker/dockercrtclient"
 	"github.com/mintoolkit/mint/pkg/crt/podman/podmancrtclient"
 
+	"github.com/mintoolkit/mint/pkg/app/master/registry"
 	"github.com/mintoolkit/mint/pkg/report"
 	"github.com/mintoolkit/mint/pkg/util/fsutil"
 	"github.com/mintoolkit/mint/pkg/util/jsonutil"
@@ -182,6 +185,26 @@ func OnCommand(
 		xc.Out.Info("runtime.load.image.none")
 	}
 
+	if cparams.RegistryPush {
+		remoteOpts := []remote.Option{
+			remote.WithContext(context.Background()),
+		}
+		remoteOpts, err = registry.ConfigureAuth(
+			cparams.UseDockerCreds,
+			cparams.CredsAccount,
+			cparams.CredsSecret,
+			remoteOpts)
+
+		xc.FailOn(err)
+
+		nameOpts := []name.Option{
+			name.WeakValidation,
+			name.Insecure,
+		}
+		err = registry.PushImageFromTar(logger, cparams.ImageArchiveFile, cparams.ImageName, nameOpts, remoteOpts)
+		xc.FailOn(err)
+	}
+
 	xc.Out.State(cmd.StateCompleted)
 	cmdReport.State = cmd.StateCompleted
 

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

@@ -4,6 +4,7 @@ import (
 	"github.com/c-bata/go-prompt"
 
 	"github.com/mintoolkit/mint/pkg/app/master/command"
+	registrycmd "github.com/mintoolkit/mint/pkg/app/master/command/registry"
 )
 
 var CommandSuggestion = prompt.Suggest{
@@ -46,6 +47,7 @@ var CommandFlagSuggestions = &command.FlagSuggestions{
 	Names: []prompt.Suggest{
 		{Text: command.FullFlagName(FlagEngine), Description: FlagEngineUsage},
 		{Text: command.FullFlagName(FlagRuntimeLoad), Description: FlagRuntimeLoadUsage},
+		{Text: command.FullFlagName(FlagRegistryPush), Description: FlagRegistryPushUsage},
 		{Text: command.FullFlagName(FlagEngineEndpoint), Description: FlagEngineEndpointUsage},
 		{Text: command.FullFlagName(FlagEngineToken), Description: FlagEngineTokenUsage},
 		{Text: command.FullFlagName(FlagEngineNamespace), Description: FlagEngineNamespaceUsage},
@@ -60,14 +62,19 @@ var CommandFlagSuggestions = &command.FlagSuggestions{
 		{Text: command.FullFlagName(FlagBaseTar), Description: FlagBaseTarUsage},
 		{Text: command.FullFlagName(FlagBaseWithCerts), Description: FlagBaseWithCertsUsage},
 		{Text: command.FullFlagName(FlagExePath), Description: FlagExePathUsage},
+		{Text: command.FullFlagName(registrycmd.FlagUseDockerCreds), Description: registrycmd.FlagUseDockerCredsUsage},
+		{Text: command.FullFlagName(registrycmd.FlagCredsAccount), Description: registrycmd.FlagCredsAccountUsage},
+		{Text: command.FullFlagName(registrycmd.FlagCredsSecret), Description: registrycmd.FlagCredsSecretUsage},
 	},
 	Values: map[string]command.CompleteValue{
-		command.FullFlagName(FlagEngine):        completeBuildEngine,
-		command.FullFlagName(FlagRuntimeLoad):   completeRuntimeLoad,
-		command.FullFlagName(FlagArchitecture):  completeArchitecture,
-		command.FullFlagName(FlagContextDir):    command.CompleteDir,
-		command.FullFlagName(FlagBaseTar):       command.CompleteFile,
-		command.FullFlagName(FlagBaseWithCerts): command.CompleteBool,
-		command.FullFlagName(FlagExePath):       command.CompleteFile,
+		command.FullFlagName(FlagEngine):                     completeBuildEngine,
+		command.FullFlagName(FlagRuntimeLoad):                completeRuntimeLoad,
+		command.FullFlagName(FlagRegistryPush):               command.CompleteBool,
+		command.FullFlagName(FlagArchitecture):               completeArchitecture,
+		command.FullFlagName(FlagContextDir):                 command.CompleteDir,
+		command.FullFlagName(FlagBaseTar):                    command.CompleteFile,
+		command.FullFlagName(FlagBaseWithCerts):              command.CompleteBool,
+		command.FullFlagName(FlagExePath):                    command.CompleteFile,
+		command.FullFlagName(registrycmd.FlagUseDockerCreds): command.CompleteTBool,
 	},
 }

pkg/app/master/command/registry/auth.go

@@ -180,17 +180,17 @@ var CLI = &cli.Command{
 	Aliases: []string{Alias},
 	Usage:   Usage,
 	Flags: []cli.Flag{
-		cflag(FlagUseDockerCreds),
-		cflag(FlagCredsAccount),
-		cflag(FlagCredsSecret),
+		Cflag(FlagUseDockerCreds),
+		Cflag(FlagCredsAccount),
+		Cflag(FlagCredsSecret),
 	},
 	Subcommands: []*cli.Command{
 		{
 			Name:  PullCmdName,
 			Usage: PullCmdNameUsage,
 			Flags: []cli.Flag{
 				command.Cflag(command.FlagTarget),
-				cflag(FlagSaveToDocker),
+				Cflag(FlagSaveToDocker),
 			},
 			Action: func(ctx *cli.Context) error {
 				gcvalues := command.GlobalFlagValues(ctx)
@@ -222,10 +222,10 @@ var CLI = &cli.Command{
 			Name:  PushCmdName,
 			Usage: PushCmdNameUsage,
 			Flags: []cli.Flag{
-				cflag(FlagAs),
-				cflag(FlagDocker),
-				cflag(FlagTar),
-				cflag(FlagOCI),
+				Cflag(FlagAs),
+				Cflag(FlagDocker),
+				Cflag(FlagTar),
+				Cflag(FlagOCI),
 			},
 			Action: func(ctx *cli.Context) error {
 				gcvalues := command.GlobalFlagValues(ctx)
@@ -272,11 +272,11 @@ var CLI = &cli.Command{
 			Name:  ImageIndexCreateCmdName,
 			Usage: ImageIndexCreateCmdNameUsage,
 			Flags: []cli.Flag{
-				cflag(FlagImageIndexName),
-				cflag(FlagImageName),
-				cflag(FlagAsManifestList),
-				cflag(FlagInsecureRefs),
-				cflag(FlagDumpRawManifest),
+				Cflag(FlagImageIndexName),
+				Cflag(FlagImageName),
+				Cflag(FlagAsManifestList),
+				Cflag(FlagInsecureRefs),
+				Cflag(FlagDumpRawManifest),
 			},
 			Action: func(ctx *cli.Context) error {
 				gcvalues := command.GlobalFlagValues(ctx)
@@ -298,13 +298,13 @@ var CLI = &cli.Command{
 			Name:  ServerCmdName,
 			Usage: ServerCmdNameUsage,
 			Flags: []cli.Flag{
-				cflag(FlagDomain),
-				cflag(FlagAddress),
-				cflag(FlagPort),
-				cflag(FlagHTTPS),
-				cflag(FlagCertPath),
-				cflag(FlagKeyPath),
-				cflag(FlagReferrersAPI),
+				Cflag(FlagDomain),
+				Cflag(FlagAddress),
+				Cflag(FlagPort),
+				Cflag(FlagHTTPS),
+				Cflag(FlagCertPath),
+				Cflag(FlagKeyPath),
+				Cflag(FlagReferrersAPI),
 			},
 			Action: func(ctx *cli.Context) error {
 				gcvalues := command.GlobalFlagValues(ctx)

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

@@ -85,7 +85,7 @@ const (
 var Flags = map[string]cli.Flag{
 	FlagUseDockerCreds: &cli.BoolFlag{
 		Name:    FlagUseDockerCreds,
-		Value:   false, //defaults to false
+		Value:   true, //defaults to true (now)
 		Usage:   FlagUseDockerCredsUsage,
 		EnvVars: []string{"DSLIM_REG_DOCKER_CREDS"},
 	},
@@ -221,7 +221,7 @@ var Flags = map[string]cli.Flag{
 	},
 }
 
-func cflag(name string) cli.Flag {
+func Cflag(name string) cli.Flag {
 	cf, ok := Flags[name]
 	if !ok {
 		log.Fatalf("unknown flag='%s'", name)

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

@@ -18,6 +18,7 @@ import (
 
 	"github.com/mintoolkit/mint/pkg/app"
 	"github.com/mintoolkit/mint/pkg/app/master/command"
+	"github.com/mintoolkit/mint/pkg/app/master/registry"
 	"github.com/mintoolkit/mint/pkg/app/master/version"
 	cmd "github.com/mintoolkit/mint/pkg/command"
 	"github.com/mintoolkit/mint/pkg/crt/docker/dockerclient"
@@ -83,8 +84,11 @@ func OnImageIndexCreateCommand(
 	remoteOpts := []remote.Option{
 		remote.WithContext(context.Background()),
 	}
-
-	remoteOpts, err = ConfigureAuth(cparams.CommonCommandParams, remoteOpts)
+	remoteOpts, err = registry.ConfigureAuth(
+		cparams.CommonCommandParams.UseDockerCreds,
+		cparams.CommonCommandParams.CredsAccount,
+		cparams.CommonCommandParams.CredsSecret,
+		remoteOpts)
 	xc.FailOn(err)
 
 	nameOpts := []name.Option{

pkg/app/master/command/registry/handler_image_index.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/mintoolkit/mint/pkg/app"
 	"github.com/mintoolkit/mint/pkg/app/master/command"
+	"github.com/mintoolkit/mint/pkg/app/master/registry"
 	"github.com/mintoolkit/mint/pkg/app/master/version"
 	cmd "github.com/mintoolkit/mint/pkg/command"
 	"github.com/mintoolkit/mint/pkg/crt/docker/dockerclient"
@@ -78,7 +79,11 @@ func OnPullCommand(
 	remoteOpts := []remote.Option{
 		remote.WithContext(context.Background()),
 	}
-	remoteOpts, err = ConfigureAuth(cparams.CommonCommandParams, remoteOpts)
+	remoteOpts, err = registry.ConfigureAuth(
+		cparams.CommonCommandParams.UseDockerCreds,
+		cparams.CommonCommandParams.CredsAccount,
+		cparams.CommonCommandParams.CredsSecret,
+		remoteOpts)
 	xc.FailOn(err)
 
 	nameOpts := []name.Option{