dedicated tag flag when building minified images from Dockerfile

slimtoolkit · Nov 16, 2019 · 3c2956b · 3c2956b
1 parent 6f727c1
commit 3c2956b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/internal/app/master/cli.go b/internal/app/master/cli.go
@@ -88,6 +88,8 @@ const (
 	FlagUseLocalMounts      = "use-local-mounts"
 	FlagUseSensorVolume     = "use-sensor-volume"
 	FlagKeepTmpArtifacts    = "keep-tmp-artifacts"
+	FlagTag                 = "tag"
+	FlagTagFat              = "tag-fat"
 )
 
 var app *cli.App
@@ -590,11 +592,17 @@ func init() {
 				doCopyMetaArtifactsFlag,
 				doRemoveFileArtifactsFlag,
 				cli.StringFlag{
-					Name:   "tag",
+					Name:   FlagTag,
 					Value:  "",
 					Usage:  "Custom tag for the generated image",
 					EnvVar: "DSLIM_TARGET_TAG",
 				},
+				cli.StringFlag{
+					Name:   FlagTagFat,
+					Value:  "",
+					Usage:  "Custom tag for the fat image built from Dockerfile",
+					EnvVar: "DSLIM_TARGET_TAG_FAT",
+				},
 				cli.StringFlag{
 					Name:   FlagImageOverrides,
 					Value:  "",
@@ -683,7 +691,8 @@ func init() {
 
 				doShowContainerLogs := ctx.Bool(FlagShowContainerLogs)
 				doShowBuildLogs := ctx.Bool(FlagShowBuildLogs)
-				doTag := ctx.String("tag")
+				doTag := ctx.String(FlagTag)
+				doTagFat := ctx.String(FlagTagFat)
 
 				doImageOverrides := ctx.String(FlagImageOverrides)
 				overrides, err := getContainerOverrides(ctx)
@@ -761,6 +770,7 @@ func init() {
 					buildFromDockerfile,
 					imageRef,
 					doTag,
+					doTagFat,
 					doHTTPProbe,
 					httpProbeCmds,
 					httpProbeRetryCount,

diff --git a/internal/app/master/commands/build.go b/internal/app/master/commands/build.go
@@ -38,6 +38,7 @@ func OnBuild(
 	buildFromDockerfile string,
 	imageRef string,
 	customImageTag string,
+	fatImageTag string,
 	doHTTPProbe bool,
 	httpProbeCmds []config.HTTPProbeCmd,
 	httpProbeRetryCount int,
@@ -85,9 +86,14 @@ func OnBuild(
 
 	if buildFromDockerfile != "" {
 		fmt.Println("docker-slim[build]: state=building message='building basic image'")
-		//create a fat image name based on the user provided custom tag if it's available
+		//create a fat image name:
+		//* use the explicit fat image tag if provided
+		//* or create one based on the user provided (slim image) custom tag if it's available
+		//* otherwise auto-generate a name
 		var fatImageRepoNameTag string
-		if customImageTag != "" {
+		if fatImageTag != "" {
+			fatImageRepoNameTag = fatImageTag
+		} else if customImageTag != "" {
 			citParts := strings.Split(customImageTag, ":")
 			switch len(citParts) {
 			case 1: