Skip to content

Handle duplicate DiffId docker image layers #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2022
Merged

Handle duplicate DiffId docker image layers #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Microsoft.ComponentDetection.Detectors/linux/LinuxContainerDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ await DockerService.TryPullImageAsync(image, cancellationToken)))
}
catch (Exception e)
{
Logger.LogWarning($"Processing of image {image} failed with exception: {e.Message}");
using var record = new LinuxContainerDetectorImageDetectionFailed
{
ExceptionType = e.GetType().ToString(),
Expand Down Expand Up @@ -153,6 +154,7 @@ await DockerService.TryPullImageAsync(image, cancellationToken)))
}
catch (Exception e)
{
Logger.LogWarning($"Scanning of image {kvp.Key} failed with exception: {e.Message}");
using var record = new LinuxContainerDetectorImageDetectionFailed
{
ExceptionType = e.GetType().ToString(),
Expand Down
10 changes: 6 additions & 4 deletions src/Microsoft.ComponentDetection.Detectors/linux/LinuxScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,12 @@ public async Task<IEnumerable<LayerMappedLinuxComponents>> ScanLinuxAsync(string
$"Scan failed with exit info: {stdout}{Environment.NewLine}{stderr}");
}

var layerDictionary = dockerLayers.ToDictionary(
layer => layer.DiffId,
layer => new List<LinuxComponent>());

var layerDictionary = dockerLayers
.DistinctBy(layer => layer.DiffId)
.ToDictionary(
layer => layer.DiffId,
_ => new List<LinuxComponent>());

try
{
var syftOutput = JsonConvert.DeserializeObject<SyftOutput>(stdout);
Expand Down