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

Don't export unless needed

Browse Source
This commit is contained in:
Ettore Di Giacinto
2020-11-10 16:57:20 +01:00
parent 665261e526
commit 36c58307e2
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/compiler/compiler.go
View File

@@ -353,7 +353,7 @@ func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage
return nil, errors.Wrap(err, "Failed building image for "+runnerOpts.ImageName+" "+runnerOpts.DockerFileName) return nil, errors.Wrap(err, "Failed building image for "+runnerOpts.ImageName+" "+runnerOpts.DockerFileName)
} }
} }
if generateArtifact {
if err := cs.Backend.ExportImage(runnerOpts); err != nil { if err := cs.Backend.ExportImage(runnerOpts); err != nil {
return nil, errors.Wrap(err, "Failed exporting image") return nil, errors.Wrap(err, "Failed exporting image")
} }
@@ -361,6 +361,7 @@ func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage
if !cs.Options.KeepImageExport { if !cs.Options.KeepImageExport {
defer os.Remove(runnerOpts.Destination) defer os.Remove(runnerOpts.Destination)
} }
}
if cs.Options.Push && buildPackageImage { if cs.Options.Push && buildPackageImage {
err = cs.Backend.Push(runnerOpts) err = cs.Backend.Push(runnerOpts)
@@ -378,6 +379,7 @@ func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage
unpack = true unpack = true
} }
if generateArtifact {
rootfs, err := ioutil.TempDir(p.GetOutputPath(), "rootfs") rootfs, err := ioutil.TempDir(p.GetOutputPath(), "rootfs")
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Could not create tempdir") return nil, errors.Wrap(err, "Could not create tempdir")
@@ -391,6 +393,7 @@ func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Could not extract rootfs") return nil, errors.Wrap(err, "Could not extract rootfs")
} }
}
if !keepImg { if !keepImg {
// We keep them around, so to not reload them from the tar (which should be the "correct way") and we automatically share the same layers // We keep them around, so to not reload them from the tar (which should be the "correct way") and we automatically share the same layers