contrib: only extract layers from history
This tool was written before v2 existed and deduplicated and listed layers out of order in their manifests.
This commit is contained in:
parent
f3848d9726
commit
e772be5f6f
@ -154,10 +154,7 @@ func AnalyzeLocalImage(imageName string, minSeverity types.Priority, endpoint, m
|
|||||||
|
|
||||||
// Retrieve history.
|
// Retrieve history.
|
||||||
log.Println("Retrieving image history")
|
log.Println("Retrieving image history")
|
||||||
layerIDs, err := historyFromManifest(tmpPath)
|
|
||||||
if err != nil {
|
|
||||||
layerIDs, err = historyFromCommand(imageName)
|
layerIDs, err = historyFromCommand(imageName)
|
||||||
}
|
|
||||||
if err != nil || len(layerIDs) == 0 {
|
if err != nil || len(layerIDs) == 0 {
|
||||||
return fmt.Errorf("Could not get image's history: %s", err)
|
return fmt.Errorf("Could not get image's history: %s", err)
|
||||||
}
|
}
|
||||||
@ -309,33 +306,6 @@ func save(imageName, path string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func historyFromManifest(path string) ([]string, error) {
|
|
||||||
mf, err := os.Open(path + "/manifest.json")
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer mf.Close()
|
|
||||||
|
|
||||||
// https://github.com/docker/docker/blob/master/image/tarexport/tarexport.go#L17
|
|
||||||
type manifestItem struct {
|
|
||||||
Config string
|
|
||||||
RepoTags []string
|
|
||||||
Layers []string
|
|
||||||
}
|
|
||||||
|
|
||||||
var manifest []manifestItem
|
|
||||||
if err = json.NewDecoder(mf).Decode(&manifest); err != nil {
|
|
||||||
return nil, err
|
|
||||||
} else if len(manifest) != 1 {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var layers []string
|
|
||||||
for _, layer := range manifest[0].Layers {
|
|
||||||
layers = append(layers, strings.TrimSuffix(layer, "/layer.tar"))
|
|
||||||
}
|
|
||||||
return layers, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func historyFromCommand(imageName string) ([]string, error) {
|
func historyFromCommand(imageName string) ([]string, error) {
|
||||||
var stderr bytes.Buffer
|
var stderr bytes.Buffer
|
||||||
cmd := exec.Command("docker", "history", "-q", "--no-trunc", imageName)
|
cmd := exec.Command("docker", "history", "-q", "--no-trunc", imageName)
|
||||||
|
Loading…
Reference in New Issue
Block a user