Skip to content

Commit

Permalink
🐛 Fix platformID for containers (#1951)
Browse files Browse the repository at this point in the history
* 🐛 Fix platformID for containers

Signed-off-by: Christian Zunker <[email protected]>

* 🐛 Fix platformID for container images

When scanning a single image which isn't present in the local docker daemon, the platformID was missing.

Fixes #1952

Signed-off-by: Christian Zunker <[email protected]>

---------

Signed-off-by: Christian Zunker <[email protected]>
  • Loading branch information
czunker authored Sep 27, 2023
1 parent 9cc6201 commit 5409771
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions providers/os/connection/docker_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,8 @@ func NewDockerEngineContainer(id uint32, conf *inventory.Config, asset *inventor
conn.PlatformIdentifier = containerid.MondooContainerID(ci.ID)
conn.Metadata.Name = containerid.ShortContainerImageID(ci.ID)
conn.Metadata.Labels = ci.Labels
conn.Asset().Name = ci.Name
asset.Name = ci.Name
asset.PlatformIds = []string{containerid.MondooContainerID(ci.ID)}
return conn, nil
} else {
log.Debug().Msg("found stopped container " + ci.ID)
Expand All @@ -268,7 +269,8 @@ func NewDockerEngineContainer(id uint32, conf *inventory.Config, asset *inventor
conn.PlatformIdentifier = containerid.MondooContainerID(ci.ID)
conn.Metadata.Name = containerid.ShortContainerImageID(ci.ID)
conn.Metadata.Labels = ci.Labels
conn.Asset().Name = ci.Name
asset.Name = ci.Name
asset.PlatformIds = []string{containerid.MondooContainerID(ci.ID)}
return conn, nil
}
}
Expand All @@ -295,7 +297,10 @@ func NewDockerContainerImageConnection(id uint32, conf *inventory.Config, asset

// The requested image isn't locally available, but we can pull it from a remote registry.
if len(resolvedAssets) > 0 && resolvedAssets[0].Connections[0].Type == "container-registry" {
return NewContainerRegistryImage(id, conf, resolvedAssets[0])
asset.Name = resolvedAssets[0].Name
asset.PlatformIds = resolvedAssets[0].PlatformIds
asset.Labels = resolvedAssets[0].Labels
return NewContainerRegistryImage(id, conf, asset)
}

// could be an image id/name, container id/name or a short reference to an image in docker engine
Expand Down

0 comments on commit 5409771

Please sign in to comment.