mirror of
https://github.com/mudler/luet.git
synced 2025-09-03 08:14:46 +00:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e705c471eb | ||
|
7cd455fff4 | ||
|
144c409908 | ||
|
f6bb7a9405 |
@@ -30,7 +30,7 @@ var cfgFile string
|
||||
var Verbose bool
|
||||
|
||||
const (
|
||||
LuetCLIVersion = "0.20.1"
|
||||
LuetCLIVersion = "0.20.2"
|
||||
LuetEnvPrefix = "LUET"
|
||||
)
|
||||
|
||||
|
@@ -1,6 +1,7 @@
|
||||
package bus
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/mudler/go-pluggable"
|
||||
"github.com/mudler/luet/pkg/api/core/types"
|
||||
)
|
||||
@@ -88,7 +89,8 @@ func (b *Bus) Initialize(ctx *types.Context, plugin ...string) {
|
||||
for _, e := range b.Manager.Events {
|
||||
b.Manager.Response(e, func(p *pluggable.Plugin, r *pluggable.EventResponse) {
|
||||
if r.Errored() {
|
||||
ctx.Fatal("Plugin", p.Name, "at", p.Executable, "Error", r.Error)
|
||||
err := fmt.Sprintf("Plugin %s at %s had an error: %s", p.Name, p.Executable, r.Error)
|
||||
ctx.Fatal(err)
|
||||
}
|
||||
ctx.Debug(
|
||||
"plugin_event",
|
||||
|
@@ -144,7 +144,7 @@ func (s *SimpleDocker) ImageReference(a string) (v1.Image, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
img, err := daemon.Image(ref)
|
||||
img, err := daemon.Image(ref, daemon.WithUnbufferedOpener())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@@ -227,6 +227,13 @@ func (cs *LuetCompiler) stripFromRootfs(includes []string, rootfs string, includ
|
||||
}
|
||||
|
||||
func (cs *LuetCompiler) unpackFs(concurrency int, keepPermissions bool, p *compilerspec.LuetCompilationSpec, runnerOpts backend.Options) (*artifact.PackageArtifact, error) {
|
||||
|
||||
if !cs.Backend.ImageExists(runnerOpts.ImageName) {
|
||||
if err := cs.Backend.DownloadImage(runnerOpts); err != nil {
|
||||
return nil, errors.Wrap(err, "failed pulling image "+runnerOpts.ImageName+" during extraction")
|
||||
}
|
||||
}
|
||||
|
||||
img, err := cs.Backend.ImageReference(runnerOpts.ImageName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -287,10 +294,18 @@ func (cs *LuetCompiler) unpackDelta(concurrency int, keepPermissions bool, p *co
|
||||
defer os.RemoveAll(rootfs) // clean up
|
||||
|
||||
pkgTag := ":package: " + p.GetPackage().HumanReadableString()
|
||||
if cs.Options.PullFirst && !cs.Backend.ImageExists(builderOpts.ImageName) && cs.Backend.ImageAvailable(builderOpts.ImageName) {
|
||||
err := cs.Backend.DownloadImage(builderOpts)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "Could not pull image")
|
||||
if cs.Options.PullFirst {
|
||||
if !cs.Backend.ImageExists(builderOpts.ImageName) {
|
||||
err := cs.Backend.DownloadImage(builderOpts)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "Could not pull image")
|
||||
}
|
||||
}
|
||||
if !cs.Backend.ImageExists(runnerOpts.ImageName) {
|
||||
err := cs.Backend.DownloadImage(runnerOpts)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "Could not pull image")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user