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

CompilerBackend now consumes a CompilerOptions

Browse Source
This commit is contained in:
Ettore Di Giacinto
2019-11-08 18:29:51 +01:00
parent 0321973359
commit 300e60984a
2 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
pkg/compiler/backend/simpleimg.go
View File

@@ -31,31 +31,62 @@ func NewSimpleImgBackend() compiler.CompilerBackend {
}
// TODO: Missing still: labels, and build args expansion
func (*SimpleImg) BuildImage(name, path, dockerfileName string) error {
buildarg := "img build -t " + name + " " + path + " -f " + dockerfileName
func (*SimpleImg) BuildImage(opts compiler.CompilerBackendOptions) error {
name := opts.ImageName
path := opts.SourcePath
dockerfileName := opts.DockerFileName
buildarg := []string{"build", "-t", name, path, "-f ", dockerfileName}
Spinner(22)
Debug("Building image "+name+" - running img with: ", buildarg)
out, err := exec.Command(buildarg).CombinedOutput()
out, err := exec.Command("img", buildarg...).CombinedOutput()
if err != nil {
return errors.Wrap(err, "Failed building image: "+out)
return errors.Wrap(err, "Failed building image: "+string(out))
}
SpinnerStop()
Info(out)
return nil
}
func (*SimpleImg) ExportImage(name, path string) error {
buildarg := "img save " + name + " -o " + path
func (*SimpleImg) RemoveImage(opts compiler.CompilerBackendOptions) error {
name := opts.ImageName
buildarg := []string{"rm", name}
Spinner(22)
Debug("Saving image "+name+" - running img with: ", buildarg)
out, err := exec.Command(buildarg).CombinedOutput()
out, err := exec.Command("img", buildarg...).CombinedOutput()
if err != nil {
return errors.Wrap(err, "Failed building image: "+out)
return errors.Wrap(err, "Failed building image: "+string(out))
}
SpinnerStop()
Info(out)
return nil
}
func (s *SimpleImg) ImageDefinitionToTar(opts compiler.CompilerBackendOptions) error {
if err := s.BuildImage(opts); err != nil {
return errors.Wrap(err, "Failed building image")
}
if err := s.ExportImage(opts); err != nil {
return errors.Wrap(err, "Failed exporting image")
}
if err := s.RemoveImage(opts); err != nil {
return errors.Wrap(err, "Failed removing image")
}
return nil
}
func (*SimpleImg) ExportImage(opts compiler.CompilerBackendOptions) error {
name := opts.ImageName
path := opts.Destination
buildarg := []string{"save", name, "-o", path}
Spinner(22)
Debug("Saving image "+name+" - running img with: ", buildarg)
out, err := exec.Command("img", buildarg...).CombinedOutput()
if err != nil {
return errors.Wrap(err, "Failed building image: "+string(out))
}
SpinnerStop()
Info(out)
return nil
}
// TODO: Use container-diff (https://github.com/GoogleContainerTools/container-diff) for checking out layer diffs

12
pkg/compiler/interface.go
View File

@@ -25,8 +25,18 @@ type Compiler interface {
GetBackend() CompilerBackend
}
type CompilerBackendOptions struct {
ImageName string
SourcePath string
DockerFileName string
Destination string
}
type CompilerBackend interface {
BuildImage(name, path,dockerfileName string) error
BuildImage(CompilerBackendOptions) error
ExportImage(CompilerBackendOptions) error
RemoveImage(CompilerBackendOptions) error
ImageDefinitionToTar(CompilerBackendOptions) error
}
// CompilationSpec represent a compilation specification derived from a package