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

Define Artifact diffs layers

Browse Source 
It also add in simpledocker a naive implementation using the container-diff binary, which is supposed to go away with a proper API implementation.
This commit is contained in:
Ettore Di Giacinto
2019-11-09 13:58:15 +01:00
parent 1131a52f97
commit 45651a3bcc
5 changed files with 117 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package backend
import (
"encoding/json"
"os/exec"
"github.com/mudler/luet/pkg/compiler"
@@ -37,6 +38,8 @@ func (*SimpleDocker) BuildImage(opts compiler.CompilerBackendOptions) error {
dockerfileName := opts.DockerFileName
buildarg := []string{"build", "-f", dockerfileName, "-t", name, "."}
Spinner(22)
defer SpinnerStop()
Debug("Building image "+name+" - running docker with: ", buildarg)
cmd := exec.Command("docker", buildarg...)
cmd.Dir = path
@@ -44,7 +47,6 @@ func (*SimpleDocker) BuildImage(opts compiler.CompilerBackendOptions) error {
if err != nil {
return errors.Wrap(err, "Failed building image: "+string(out))
}
SpinnerStop()
Info(string(out))
return nil
}
@@ -53,11 +55,11 @@ func (*SimpleDocker) RemoveImage(opts compiler.CompilerBackendOptions) error {
name := opts.ImageName
buildarg := []string{"rmi", name}
Spinner(22)
defer SpinnerStop()
out, err := exec.Command("docker", buildarg...).CombinedOutput()
if err != nil {
return errors.Wrap(err, "Failed removing image: "+string(out))
}
SpinnerStop()
Info(string(out))
return nil
}
@@ -81,14 +83,59 @@ func (*SimpleDocker) ExportImage(opts compiler.CompilerBackendOptions) error {
buildarg := []string{"save", name, "-o", path}
Spinner(22)
defer SpinnerStop()
Debug("Saving image "+name+" - running docker with: ", buildarg)
out, err := exec.Command("docker", buildarg...).CombinedOutput()
if err != nil {
return errors.Wrap(err, "Failed exporting image: "+string(out))
}
SpinnerStop()
Info(string(out))
return nil
}
// TODO: Use container-diff (https://github.com/GoogleContainerTools/container-diff) for checking out layer diffs
// container-diff diff daemon://luet/base alpine --type=file -j
// [
// {
// "Image1": "luet/base",
// "Image2": "alpine",
// "DiffType": "File",
// "Diff": {
// "Adds": null,
// "Dels": [
// {
// "Name": "/luetbuild",
// "Size": 5830706
// },
// {
// "Name": "/luetbuild/Dockerfile",
// "Size": 50
// },
// {
// "Name": "/luetbuild/output1",
// "Size": 5830656
// }
// ],
// "Mods": null
// }
// }
// ]
// Changes uses container-diff (https://github.com/GoogleContainerTools/container-diff) for retrieving out layer diffs
func (*SimpleDocker) Changes(fromImage, toImage string) ([]compiler.ArtifactLayer, error) {
diffargs := []string{"diff", fromImage, toImage, "--type=file", "-j"}
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
}