🆕 Tag 0.22.1

* [WIP] Unpack local docker images

* unpack local image

* PR feedback + missing new function call

Co-authored-by: Ettore Di Giacinto <mudler@users.noreply.github.com>

cmd/build.go

@@ -86,7 +86,6 @@ Build packages specifying multiple definition trees:
 		viper.BindPFlag("wait", cmd.Flags().Lookup("wait"))
 		viper.BindPFlag("keep-images", cmd.Flags().Lookup("keep-images"))
 
-		viper.BindPFlag("general.show_build_output", cmd.Flags().Lookup("live-output"))
 		viper.BindPFlag("backend-args", cmd.Flags().Lookup("backend-args"))
 
 	},
@@ -334,7 +333,6 @@ func init() {
 	buildCmd.Flags().Float32("solver-discount", 1.0, "Solver discount rate")
 	buildCmd.Flags().Int("solver-attempts", 9000, "Solver maximum attempts")
 	buildCmd.Flags().Bool("solver-concurrent", false, "Use concurrent solver (experimental)")
-	buildCmd.Flags().Bool("live-output", true, "Enable live output of the build phase.")
 	buildCmd.Flags().Bool("from-repositories", false, "Consume the user-defined repositories to pull specfiles from")
 	buildCmd.Flags().Bool("rebuild", false, "To combine with --pull. Allows to rebuild the target package even if an image is available, against a local values file")
 	buildCmd.Flags().Bool("pretend", false, "Just print what packages will be compiled")

cmd/root.go

@@ -30,7 +30,7 @@ var cfgFile string
 var Verbose bool
 
 const (
-	LuetCLIVersion = "0.22.0"
+	LuetCLIVersion = "0.22.1"
 	LuetEnvPrefix  = "LUET"
 )
 

cmd/util.go

@@ -89,7 +89,7 @@ func NewUnpackCommand() *cobra.Command {
 		Use:   "unpack image path",
 		Short: "Unpack a docker image natively",
 		Long: `unpack doesn't need the docker daemon to run, and unpacks a docker image in the specified directory:
-		
+
 	luet util unpack golang:alpine /alpine
 `,
 		PreRun: func(cmd *cobra.Command, args []string) {
@@ -107,7 +107,7 @@ func NewUnpackCommand() *cobra.Command {
 				util.DefaultContext.Error("Invalid path %s", destination)
 				os.Exit(1)
 			}
-
+			local, _ := cmd.Flags().GetBool("local")
 			verify, _ := cmd.Flags().GetBool("verify")
 			user, _ := cmd.Flags().GetString("auth-username")
 			pass, _ := cmd.Flags().GetString("auth-password")
@@ -126,13 +126,22 @@ func NewUnpackCommand() *cobra.Command {
 				RegistryToken: registryToken,
 			}
 
-			info, err := docker.DownloadAndExtractDockerImage(util.DefaultContext, image, destination, auth, verify)
-			if err != nil {
-				util.DefaultContext.Error(err.Error())
-				os.Exit(1)
+			if !local {
+				info, err := docker.DownloadAndExtractDockerImage(util.DefaultContext, image, destination, auth, verify)
+				if err != nil {
+					util.DefaultContext.Error(err.Error())
+					os.Exit(1)
+				}
+				util.DefaultContext.Info(fmt.Sprintf("Pulled: %s %s", info.Target.Digest, info.Name))
+				util.DefaultContext.Info(fmt.Sprintf("Size: %s", units.BytesSize(float64(info.Target.Size))))
+			} else {
+				info, err := docker.ExtractDockerImage(util.DefaultContext, image, destination)
+				if err != nil {
+					util.DefaultContext.Error(err.Error())
+					os.Exit(1)
+				}
+				util.DefaultContext.Info(fmt.Sprintf("Size: %s", units.BytesSize(float64(info.Target.Size))))
 			}
-			util.DefaultContext.Info(fmt.Sprintf("Pulled: %s %s", info.Target.Digest, info.Name))
-			util.DefaultContext.Info(fmt.Sprintf("Size: %s", units.BytesSize(float64(info.Target.Size))))
 		},
 	}
 
@@ -143,6 +152,7 @@ func NewUnpackCommand() *cobra.Command {
 	c.Flags().String("auth-identity-token", "", "Authentication identity token")
 	c.Flags().String("auth-registry-token", "", "Authentication registry token")
 	c.Flags().Bool("verify", false, "Verify signed images to notary before to pull")
+	c.Flags().Bool("local", false, "Unpack local image")
 	return c
 }
 

cmd/util/config.go

@@ -220,7 +220,7 @@ func setDefaults(viper *viper.Viper) {
 	viper.SetDefault("general.concurrency", runtime.NumCPU())
 	viper.SetDefault("general.debug", false)
 	viper.SetDefault("general.quiet", false)
-	viper.SetDefault("general.show_build_output", false)
+	viper.SetDefault("general.show_build_output", true)
 	viper.SetDefault("general.fatal_warnings", false)
 	viper.SetDefault("general.http_timeout", 360)
 
@@ -278,6 +278,7 @@ func InitViper(RootCmd *cobra.Command) {
 	pflags.Float32("solver-rate", 0.7, "Solver learning rate")
 	pflags.Float32("solver-discount", 1.0, "Solver discount rate")
 	pflags.Int("solver-attempts", 9000, "Solver maximum attempts")
+	pflags.Bool("live-output", true, "Show live output during build")
 
 	pflags.Bool("same-owner", true, "Maintain same owner on uncompress.")
 	pflags.Int("concurrency", runtime.NumCPU(), "Concurrency")
@@ -303,6 +304,7 @@ func InitViper(RootCmd *cobra.Command) {
 	viper.BindPFlag("general.same_owner", pflags.Lookup("same-owner"))
 	viper.BindPFlag("plugin", pflags.Lookup("plugin"))
 	viper.BindPFlag("general.http_timeout", pflags.Lookup("http-timeout"))
+	viper.BindPFlag("general.show_build_output", pflags.Lookup("live-output"))
 
 	// Currently I maintain this only from cli.
 	viper.BindPFlag("no_spinner", pflags.Lookup("no-spinner"))

pkg/helpers/docker/docker.go

@@ -33,6 +33,7 @@ import (
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
+	"github.com/google/go-containerregistry/pkg/v1/daemon"
 	"github.com/mudler/luet/pkg/api/core/bus"
 	"github.com/opencontainers/go-digest"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
@@ -192,3 +193,60 @@ func DownloadAndExtractDockerImage(ctx luettypes.Context, image, dest string, au
 		},
 	}, nil
 }
+
+func ExtractDockerImage(ctx luettypes.Context, local, dest string)(*images.Image, error) {
+	if !fileHelper.Exists(dest) {
+		if err := os.MkdirAll(dest, os.ModePerm); err != nil {
+			return nil, errors.Wrapf(err, "cannot create destination directory")
+		}
+	}
+
+	ref, err := name.ParseReference(local)
+	if err != nil {
+		return nil, err
+	}
+
+	img, err := daemon.Image(ref)
+	if err != nil {
+		return nil, err
+	}
+
+	m, err := img.Manifest()
+	if err != nil {
+		return nil, err
+	}
+
+	mt, err := img.MediaType()
+	if err != nil {
+		return nil, err
+	}
+
+	d, err := img.Digest()
+	if err != nil {
+		return nil, err
+	}
+
+	var c int64
+	c, _, err = luetimages.ExtractTo(
+		ctx,
+		img,
+		dest,
+		nil,
+	)
+
+	if err != nil {
+		return nil, err
+	}
+
+	bus.Manager.Publish(bus.EventImagePostUnPack, UnpackEventData{Image: local, Dest: dest})
+
+	return &images.Image{
+		Name:   local,
+		Labels: m.Annotations,
+		Target: specs.Descriptor{
+			MediaType: string(mt),
+			Digest:    digest.Digest(d.String()),
+			Size:      c,
+		},
+	}, nil
+}

pkg/installer/repository.go

@@ -866,6 +866,8 @@ func (r *LuetSystemRepository) Sync(ctx types.Context, force bool) (*LuetSystemR
 			toTimeSync = true
 			ctx.Debug(r.Name, "is old, refresh is suggested")
 		}
+	} else {
+		toTimeSync = true
 	}
 
 	ctx.Debug("Sync of the repository", r.Name, "in progress...")
@@ -893,6 +895,10 @@ func (r *LuetSystemRepository) Sync(ctx types.Context, force bool) (*LuetSystemR
 			return nil, err
 		}
 		defer os.RemoveAll(file)
+		defer func() {
+			now := time.Now().Format(time.RFC3339)
+			ioutil.WriteFile(filepath.Join(repobasedir, "SYNCTIME"), []byte(now), os.ModePerm)
+		}()
 	} else {
 		downloadedRepoMeta, err = r.ReadSpecFile(repoFile)
 		if err != nil {
@@ -990,8 +996,6 @@ func (r *LuetSystemRepository) Sync(ctx types.Context, force bool) (*LuetSystemR
 				downloadedRepoMeta.GetRevision(),
 				time.Unix(tsec, 0).String()))
 
-		now := time.Now().Format(time.RFC3339)
-		ioutil.WriteFile(filepath.Join(repobasedir, "SYNCTIME"), []byte(now), os.ModePerm)
 	}
 
 	meta, err := NewLuetSystemRepositoryMetadata(