cleanup, --include-distro-info build flag

Signed-off-by: Kyle Quest <[email protected]>

Author: kcq

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

@@ -129,6 +129,7 @@ var BuildFlags = (append([]cli.Flag{
 	cflag(FlagAppImageDockerfile),
 	cflag(FlagIncludePathsCreportFile),
 	cflag(FlagIncludeHealthcheck),
+	cflag(FlagIncludeDistroInfo),
 	cflag(FlagIncludeOSLibsNet),
 	cflag(FlagIncludeSSHClient),
 	cflag(FlagIncludeZoneInfo),
@@ -701,6 +702,7 @@ var CLI = &cli.Command{
 			xc.Exit(-1)
 		}
 
+		doIncludeDistroInfo := ctx.Bool(FlagIncludeDistroInfo)
 		doIncludeHealthcheck := ctx.Bool(FlagIncludeHealthcheck)
 
 		doIncludeSSHClient := ctx.Bool(FlagIncludeSSHClient)
@@ -820,6 +822,7 @@ var CLI = &cli.Command{
 			doIncludeShell,
 			doIncludeWorkdir,
 			doIncludeHealthcheck,
+			doIncludeDistroInfo,
 			includeLastImageLayers,
 			doIncludeAppImageAll,
 			appImageStartInstGroup,

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

@@ -43,6 +43,9 @@ const (
 	FlagIncludeHealthcheck      = "include-healthcheck"
 	FlagIncludeHealthcheckUsage = "Keep the HEALTHCHECK related artifacts"
 
+	FlagIncludeDistroInfo      = "include-distro-info"
+	FlagIncludeDistroInfoUsage = "Keep OS distro metadata"
+
 	//TBD
 	FlagWorkdirExclude      = "workdir-exclude"
 	FlagWorkdirExcludeUsage = "Exclude filter for artifacts when working directory is included"
@@ -351,6 +354,12 @@ var Flags = map[string]cli.Flag{
 		Usage:   FlagIncludeHealthcheckUsage,
 		EnvVars: []string{"DSLIM_INCLUDE_HEALTHCHECK"},
 	},
+	FlagIncludeDistroInfo: &cli.BoolFlag{
+		Name:    FlagIncludeDistroInfo,
+		Value:   false,
+		Usage:   FlagIncludeDistroInfoUsage,
+		EnvVars: []string{"DSLIM_INCLUDE_DISTRO_INFO"},
+	},
 	////
 	FlagIncludeSSHClient: &cli.BoolFlag{
 		Name:    FlagIncludeSSHClient,

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

@@ -124,6 +124,7 @@ func OnCommand(
 	doIncludeShell bool,
 	doIncludeWorkdir bool,
 	doIncludeHealthcheck bool,
+	doIncludeDistroInfo bool,
 	includeLastImageLayers uint,
 	doIncludeAppImageAll bool,
 	appImageStartInstGroup int,
@@ -1095,6 +1096,7 @@ func OnCommand(
 		doIncludeShell,
 		doIncludeWorkdir,
 		doIncludeHealthcheck,
+		doIncludeDistroInfo,
 		doIncludeCertAll,
 		doIncludeCertBundles,
 		doIncludeCertDirs,

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

@@ -123,6 +123,7 @@ var CommandFlagSuggestions = &command.FlagSuggestions{
 		{Text: command.FullFlagName(FlagAppImageDockerfile), Description: FlagAppImageDockerfileUsage},
 		{Text: command.FullFlagName(FlagIncludePathsCreportFile), Description: FlagIncludePathsCreportFileUsage},
 		{Text: command.FullFlagName(FlagIncludeHealthcheck), Description: FlagIncludeHealthcheckUsage},
+		{Text: command.FullFlagName(FlagIncludeDistroInfo), Description: FlagIncludeDistroInfoUsage},
 		{Text: command.FullFlagName(FlagIncludeSSHClient), Description: FlagIncludeSSHClientUsage},
 		{Text: command.FullFlagName(FlagIncludeOSLibsNet), Description: FlagIncludeOSLibsNetUsage},
 		{Text: command.FullFlagName(FlagIncludeCertAll), Description: FlagIncludeCertAllUsage},
@@ -205,6 +206,7 @@ var CommandFlagSuggestions = &command.FlagSuggestions{
 		command.FullFlagName(FlagIncludeExeFile):                         command.CompleteFile,
 		command.FullFlagName(FlagIncludePathsCreportFile):                command.CompleteFile,
 		command.FullFlagName(FlagIncludeHealthcheck):                     command.CompleteBool,
+		command.FullFlagName(FlagIncludeDistroInfo):                      command.CompleteBool,
 		command.FullFlagName(FlagIncludeShell):                           command.CompleteBool,
 		command.FullFlagName(FlagIncludeWorkdir):                         command.CompleteBool,
 		command.FullFlagName(FlagIncludeAppImageAll):                     command.CompleteBool,

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

@@ -258,6 +258,7 @@ func OnCommand(
 		false, //doIncludeShell,
 		false, //doIncludeWorkdir,
 		false, //doIncludeHealthcheck
+		false, //doIncludeDistroInfo
 		false, //doIncludeCertAll
 		false, //doIncludeCertBundles
 		false, //doIncludeCertDirs

pkg/app/master/inspectors/container/container_inspector.go

@@ -121,6 +121,7 @@ type Inspector struct {
 	DoIncludeShell           bool
 	DoIncludeWorkdir         bool
 	DoIncludeHealthcheck     bool
+	DoIncludeDistroInfo      bool
 	DoIncludeCertAll         bool
 	DoIncludeCertBundles     bool
 	DoIncludeCertDirs        bool
@@ -204,6 +205,7 @@ func NewInspector(
 	doIncludeShell bool,
 	doIncludeWorkdir bool,
 	doIncludeHealthcheck bool,
+	doIncludeDistroInfo bool,
 	doIncludeCertAll bool,
 	doIncludeCertBundles bool,
 	doIncludeCertDirs bool,
@@ -264,6 +266,7 @@ func NewInspector(
 		DoIncludeShell:           doIncludeShell,
 		DoIncludeWorkdir:         doIncludeWorkdir,
 		DoIncludeHealthcheck:     doIncludeHealthcheck,
+		DoIncludeDistroInfo:      doIncludeDistroInfo,
 		DoIncludeCertAll:         doIncludeCertAll,
 		DoIncludeCertBundles:     doIncludeCertBundles,
 		DoIncludeCertDirs:        doIncludeCertDirs,
@@ -842,6 +845,7 @@ func (i *Inspector) RunContainer() error {
 		}
 	}
 
+	cmd.IncludeDistroInfo = i.DoIncludeDistroInfo
 	cmd.IncludeCertAll = i.DoIncludeCertAll
 	cmd.IncludeCertBundles = i.DoIncludeCertBundles
 	cmd.IncludeCertDirs = i.DoIncludeCertDirs