pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-03-08 03:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log the container name and id

Browse Source
This commit is contained in:
Jonny Booker
2025-06-10 13:05:41 +01:00
parent 126ced6d57
commit 5476a69963
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docker/client.go
View File

@@ -141,6 +141,9 @@ func ListContainers(socketPath string, enforceNetworkValidation bool, containerN
var dockerContainers []Container var dockerContainers []Container
for _, c := range containers { for _, c := range containers {
// Short ID like docker ps
shortId := c.ID[:12]
// Get container name (remove leading slash) // Get container name (remove leading slash)
name := "" name := ""
if len(c.Names) > 0 { if len(c.Names) > 0 {
@@ -169,7 +172,7 @@ func ListContainers(socketPath string, enforceNetworkValidation bool, containerN
// Inspect the container to get detailed network information // Inspect the container to get detailed network information
containerInfo, err := cli.ContainerInspect(ctx, c.ID) containerInfo, err := cli.ContainerInspect(ctx, c.ID)
if err != nil { if err != nil {
logger.Debug("Failed to inspect container %s for network info: %v", c.ID[:12], err) logger.Debug("Failed to inspect container %s (%s) for network info: %v", shortId, name, err)
// Continue without network info if inspection fails // Continue without network info if inspection fails
} else { } else {
// Only containers within the host container network will be returned // Only containers within the host container network will be returned
@@ -209,13 +212,13 @@ func ListContainers(socketPath string, enforceNetworkValidation bool, containerN
// Don't continue returning this container if not in the host container network(s) // Don't continue returning this container if not in the host container network(s)
if enforceNetworkValidation && !isInHostContainerNetwork { if enforceNetworkValidation && !isInHostContainerNetwork {
logger.Debug("container not found within the host container network, skipping: %s", name) logger.Debug("Container not found within the host container network, skipping: %s (%s)", shortId, name)
continue continue
} }
} }
dockerContainer := Container{ dockerContainer := Container{
ID: c.ID[:12], // Show short ID like docker ps ID: shortId,
Name: name, Name: name,
Image: c.Image, Image: c.Image,
State: c.State, State: c.State,