kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-02 07:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ux: rework displaying of success messages

Browse Source
This commit is contained in:
Ettore Di Giacinto
2021-10-22 17:55:38 +02:00
parent 5eb5a42bf7
commit 6b45b1d61c
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/compiler/backend/simpledocker.go
View File

@@ -56,7 +56,7 @@ func (s *SimpleDocker) BuildImage(opts Options) error {
return err return err
} }
s.ctx.Info(":whale: Building image " + name + " done") s.ctx.Success(":whale: Building image " + name + " done")
bus.Manager.Publish(bus.EventImagePostBuild, opts) bus.Manager.Publish(bus.EventImagePostBuild, opts)
@@ -70,7 +70,7 @@ func (s *SimpleDocker) CopyImage(src, dst string) error {
if err != nil { if err != nil {
return errors.Wrap(err, "Failed tagging image: "+string(out)) return errors.Wrap(err, "Failed tagging image: "+string(out))
} }
s.ctx.Info(":whale: Tagged image:", src, "->", dst) s.ctx.Success(":whale: Tagged image:", src, "->", dst)
return nil return nil
} }
@@ -90,7 +90,7 @@ func (s *SimpleDocker) DownloadImage(opts Options) error {
return errors.Wrap(err, "Failed pulling image: "+string(out)) return errors.Wrap(err, "Failed pulling image: "+string(out))
} }
s.ctx.Info(":whale: Downloaded image:", name) s.ctx.Success(":whale: Downloaded image:", name)
bus.Manager.Publish(bus.EventImagePostPull, opts) bus.Manager.Publish(bus.EventImagePostPull, opts)
return nil return nil
@@ -120,7 +120,7 @@ func (s *SimpleDocker) RemoveImage(opts Options) error {
if err != nil { if err != nil {
return errors.Wrap(err, "Failed removing image: "+string(out)) return errors.Wrap(err, "Failed removing image: "+string(out))
} }
s.ctx.Info(":whale: Removed image:", name) s.ctx.Success(":whale: Removed image:", name)
//Info(string(out)) //Info(string(out))
return nil return nil
} }
@@ -137,7 +137,7 @@ func (s *SimpleDocker) Push(opts Options) error {
if err != nil { if err != nil {
return errors.Wrap(err, "Failed pushing image: "+string(out)) return errors.Wrap(err, "Failed pushing image: "+string(out))
} }
s.ctx.Info(":whale: Pushed image:", name) s.ctx.Success(":whale: Pushed image:", name)
bus.Manager.Publish(bus.EventImagePostPush, opts) bus.Manager.Publish(bus.EventImagePostPush, opts)
//Info(string(out)) //Info(string(out))

8
pkg/compiler/compiler.go
View File

@@ -447,7 +447,7 @@ func (cs *LuetCompiler) genArtifact(p *compilerspec.LuetCompilationSpec, builder
if err != nil { if err != nil {
return a, errors.Wrap(err, "Failed while writing metadata file") return a, errors.Wrap(err, "Failed while writing metadata file")
} }
cs.Options.Context.Info(pkgTag, " :white_check_mark: done (empty virtual package)") cs.Options.Context.Success(pkgTag, " :white_check_mark: done (empty virtual package)")
return a, nil return a, nil
} }
@@ -477,7 +477,7 @@ func (cs *LuetCompiler) genArtifact(p *compilerspec.LuetCompilationSpec, builder
if err != nil { if err != nil {
return a, errors.Wrap(err, "Failed while writing metadata file") return a, errors.Wrap(err, "Failed while writing metadata file")
} }
cs.Options.Context.Info(pkgTag, " :white_check_mark: Done") cs.Options.Context.Success(pkgTag, " :white_check_mark: Done")
return a, nil return a, nil
} }
@@ -965,7 +965,7 @@ func (cs *LuetCompiler) resolveMultiStageImages(concurrency int, keepPermissions
Source: c.Source, Source: c.Source,
Destination: c.Destination, Destination: c.Destination,
}) })
cs.Options.Context.Info(copyTag2, ":white_check_mark: Done") cs.Options.Context.Success(copyTag2, ":white_check_mark: Done")
} else { } else {
resolvedCopyFields = append(resolvedCopyFields, c) resolvedCopyFields = append(resolvedCopyFields, c)
} }
@@ -1128,7 +1128,7 @@ func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, generateF
a.PackageCacheImage = assertion.Hash.PackageHash a.PackageCacheImage = assertion.Hash.PackageHash
cs.Options.Context.Info(pkgTag, ":white_check_mark: Done") cs.Options.Context.Success(pkgTag, ":white_check_mark: Done")
bus.Manager.Publish(bus.EventPackagePostBuild, struct { bus.Manager.Publish(bus.EventPackagePostBuild, struct {
CompileSpec *compilerspec.LuetCompilationSpec CompileSpec *compilerspec.LuetCompilationSpec

1
pkg/installer/repository_docker.go
View File

@@ -262,7 +262,6 @@ func (d *dockerRepositoryGenerator) Generate(r *LuetSystemRepository, imagePrefi
artifacts, snapshotRepoFile, err := r.Snapshot(id, repoTemp) artifacts, snapshotRepoFile, err := r.Snapshot(id, repoTemp)
if err != nil { if err != nil {
return errors.Wrap(err, "while creating snapshot") return errors.Wrap(err, "while creating snapshot")
} }
if err := d.pushRepoMetadata(snapshotRepoFile, filepath.Base(snapshotRepoFile), r); err != nil { if err := d.pushRepoMetadata(snapshotRepoFile, filepath.Base(snapshotRepoFile), r); err != nil {
return errors.Wrap(err, "while pushing repository snapshot metadata tree") return errors.Wrap(err, "while pushing repository snapshot metadata tree")