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

Reuse docker backend in some Img functions

Browse Source
This commit is contained in:
Ettore Di Giacinto
2019-11-17 18:38:57 +01:00
parent 5083b295b2
commit 6e662c75ce
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@
package backend package backend
import ( import (
"encoding/json"
"os/exec" "os/exec"
"github.com/mudler/luet/pkg/compiler" "github.com/mudler/luet/pkg/compiler"
@@ -122,26 +121,11 @@ func (*SimpleImg) ExportImage(opts compiler.CompilerBackendOptions) error {
// TODO: Dup in docker, refactor common code in helpers for shared parts // TODO: Dup in docker, refactor common code in helpers for shared parts
func (*SimpleImg) ExtractRootfs(opts compiler.CompilerBackendOptions, keepPerms bool) error { func (*SimpleImg) ExtractRootfs(opts compiler.CompilerBackendOptions, keepPerms bool) error {
return errors.New("Not implemented") return NewSimpleDockerBackend().ExtractRootfs(opts, keepPerms)
} }
// TODO: Use container-diff (https://github.com/GoogleContainerTools/container-diff) for checking out layer diffs // TODO: Use container-diff (https://github.com/GoogleContainerTools/container-diff) for checking out layer diffs
// Changes uses container-diff (https://github.com/GoogleContainerTools/container-diff) for retrieving out layer diffs // Changes uses container-diff (https://github.com/GoogleContainerTools/container-diff) for retrieving out layer diffs
func (*SimpleImg) Changes(fromImage, toImage string) ([]compiler.ArtifactLayer, error) { func (*SimpleImg) Changes(fromImage, toImage string) ([]compiler.ArtifactLayer, error) {
diffargs := []string{"diff", fromImage, toImage, "--type=file", "-j"} return NewSimpleDockerBackend().Changes(fromImage, toImage)
Spinner(22)
defer SpinnerStop()
out, err := exec.Command("container-diff", diffargs...).CombinedOutput()
if err != nil {
return []compiler.ArtifactLayer{}, errors.Wrap(err, "Failed Resolving layer diffs: "+string(out))
}
var diffs []compiler.ArtifactLayer
err = json.Unmarshal(out, &diffs)
if err != nil {
return []compiler.ArtifactLayer{}, errors.Wrap(err, "Failed unmarshalling json response: "+string(out))
}
return diffs, nil
} }