saving image when using simple build engine for the buildimage command

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

Author: kcq

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

@@ -61,9 +61,10 @@ func HandleSimpleEngine(
 	doShowBuildLogs := true
 	builder, err := internalbuilder.New(doShowBuildLogs, false, false)
 	options := imagebuilder.SimpleBuildOptions{
-		From:    cparams.BaseImage,
-		FromTar: cparams.BaseImageTar,
-		Tags:    []string{cparams.ImageName},
+		OutputImageTar: cparams.ImageArchiveFile,
+		From:           cparams.BaseImage,
+		FromTar:        cparams.BaseImageTar,
+		Tags:           []string{cparams.ImageName},
 		Layers: []imagebuilder.LayerDataInfo{
 			{
 				Type:   imagebuilder.FileSource,

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

@@ -155,7 +155,7 @@ func pushImageFromTar(
 	remoteImageName string,
 	nameOpts []name.Option,
 	remoteOpts []remote.Option) error {
-	logger = logger.WithField("op", "registry.saveDockerImage")
+	logger = logger.WithField("op", "registry.pushImageFromTar")
 	logger.Trace("call")
 	defer logger.Trace("exit")
 

pkg/imagebuilder/imagebuilder.go

@@ -112,6 +112,7 @@ type SimpleBuildOptions struct {
 	Layers           []LayerDataInfo
 	ImageConfig      *ImageConfig
 	HideBuildHistory bool
+	OutputImageTar   string
 
 	/*
 	   //todo:  add 'Healthcheck'

pkg/imagebuilder/internalbuilder/engine.go

@@ -278,16 +278,17 @@ func (ref *Engine) Build(options imagebuilder.SimpleBuildOptions) (*imagebuilder
 		return nil, err
 	}
 
-	s2t := func(val string) v1.Time {
-		ptime, err := time.Parse(time.RFC3339, val)
-		if err != nil {
-			log.WithError(err).Error("time.Parse")
-			return v1.Time{Time: time.Now()}
+	newImageConfig = newImageConfig.DeepCopy()
+	if options.ImageConfig != nil {
+		s2t := func(val string) v1.Time {
+			ptime, err := time.Parse(time.RFC3339, val)
+			if err != nil {
+				log.WithError(err).Error("time.Parse")
+				return v1.Time{Time: time.Now()}
+			}
+			return v1.Time{Time: ptime}
 		}
-		return v1.Time{Time: ptime}
-	}
 
-	if options.ImageConfig != nil {
 		if len(options.ImageConfig.History) > 0 {
 			var history []v1.History
 			for _, h := range options.ImageConfig.History {
@@ -597,6 +598,13 @@ func (ref *Engine) Build(options imagebuilder.SimpleBuildOptions) (*imagebuilder
 		return nil, err
 	}
 
+	if options.OutputImageTar != "" {
+		if err := tarball.WriteToFile(options.OutputImageTar, tag, newImg); err != nil {
+			log.WithError(err).Errorf("tarball.WriteToFile(%s, %s)", options.OutputImageTar, options.Tags[0])
+			return nil, err
+		}
+	}
+
 	if ref.PushToDaemon {
 		log.Debug("DefaultSimpleBuilder.Build: saving image to Docker")
 		imageLoadResponseStr, err := daemon.Write(tag, newImg)