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

Don't hide error on pulling image

Browse Source
This commit is contained in:
Ettore Di Giacinto
2020-11-28 18:03:43 +01:00
parent 87004c8e78
commit 9784d6192a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,7 @@ func (*SimpleDocker) DownloadImage(opts compiler.CompilerBackendOptions) error {
cmd := exec.Command("docker", buildarg...) cmd := exec.Command("docker", buildarg...)
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return errors.Wrap(err, "Failed building image: "+string(out)) return errors.Wrap(err, "Failed pulling image: "+string(out))
} }
Info(":whale: Downloaded image:", name) Info(":whale: Downloaded image:", name)
return nil return nil

6
pkg/compiler/compiler.go
View File

@@ -368,8 +368,12 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
buildAndPush := func(opts CompilerBackendOptions) error { buildAndPush := func(opts CompilerBackendOptions) error {
buildImage := true buildImage := true
if cs.Options.PullFirst { if cs.Options.PullFirst {
if err := cs.Backend.DownloadImage(opts); err == nil { err := cs.Backend.DownloadImage(opts)
if err == nil {
buildImage = false buildImage = false
} else {
Warning("Failed to download image. Will keep going and build the image unless you use --fatal")
Warning(err.Error())
} }
} }
if buildImage { if buildImage {