Tag 0.9.7

cmd/root.go

@@ -40,7 +40,7 @@ var Verbose bool
 var LockedCommands = []string{"install", "uninstall", "upgrade"}
 
 const (
-	LuetCLIVersion = "0.9.6"
+	LuetCLIVersion = "0.9.7"
 	LuetEnvPrefix  = "LUET"
 )
 

cmd/search.go

@@ -57,7 +57,7 @@ func packageToList(l list.Writer, repo string, p pkg.Package) {
 	l.AppendItem(p.HumanReadableString())
 	l.Indent()
 	l.AppendItem(fmt.Sprintf("Category: %s", p.GetCategory()))
-	l.AppendItem(fmt.Sprintf("Name: %s", p.GetCategory()))
+	l.AppendItem(fmt.Sprintf("Name: %s", p.GetName()))
 	l.AppendItem(fmt.Sprintf("Version: %s", p.GetVersion()))
 	l.AppendItem(fmt.Sprintf("Description: %s", p.GetDescription()))
 	l.AppendItem(fmt.Sprintf("Repository: %s ", repo))

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/docker/docker v17.12.0-ce-rc1.0.20200417035958-130b0bc6032c+incompatible
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/ecooper/qlearning v0.0.0-20160612200101-3075011a69fd
+	github.com/fsouza/go-dockerclient v1.6.4
 	github.com/ghodss/yaml v1.0.0
 	github.com/hashicorp/go-version v1.2.0
 	github.com/jedib0t/go-pretty v4.3.0+incompatible

pkg/compiler/backend/simpledocker.go

@@ -24,6 +24,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	docker "github.com/fsouza/go-dockerclient"
 	capi "github.com/mudler/docker-companion/api"
 
 	"github.com/mudler/luet/pkg/compiler"
@@ -45,6 +46,7 @@ func (*SimpleDocker) BuildImage(opts compiler.CompilerBackendOptions) error {
 	name := opts.ImageName
 	path := opts.SourcePath
 	dockerfileName := opts.DockerFileName
+
 	buildarg := []string{"build", "-f", dockerfileName, "-t", name, "."}
 
 	Debug(":whale2: Building image " + name)
@@ -56,6 +58,21 @@ func (*SimpleDocker) BuildImage(opts compiler.CompilerBackendOptions) error {
 	}
 	Info(":whale: Building image " + name + " done")
 
+	if os.Getenv("DOCKER_SQUASH") == "true" {
+		Info(":whale: Squashing image " + name)
+		var client *docker.Client
+
+		client, err = docker.NewClientFromEnv()
+		if err != nil {
+			return errors.Wrap(err, "could not connect to the Docker daemon")
+		}
+		err = capi.Squash(client, name, name)
+		if err != nil {
+			return errors.Wrap(err, "Failed squashing image")
+		}
+		Info(":whale: Squashing image " + name + " done")
+	}
+
 	if config.LuetCfg.GetGeneral().ShowBuildOutput {
 		Info(string(out))
 	} else {

pkg/installer/installer.go

@@ -757,12 +757,11 @@ func (l *LuetInstaller) computeUninstall(p pkg.Package, s *System) (pkg.Packages
 }
 func (l *LuetInstaller) Uninstall(p pkg.Package, s *System) error {
 	Spinner(32)
-	defer SpinnerStop()
-
 	toUninstall, err := l.computeUninstall(p, s)
 	if err != nil {
 		return errors.Wrap(err, "while computing uninstall")
 	}
+	SpinnerStop()
 
 	uninstall := func() error {
 		for _, p := range toUninstall {