Skip to content

Fix wrong handling of old docker versions [SMAGENT-974] #1175

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
mattpag merged 2 commits into from
Jul 12, 2018
Merged

Fix wrong handling of old docker versions [SMAGENT-974] #1175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a2d04f
Reset the output buffer before retrying to contact the docker daemon
mattpag Jul 11, 2018
6a646fd
Fix wrong empty docker imageID handling
mattpag Jul 11, 2018
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
9 changes: 6 additions & 3 deletions userspace/libsinsp/container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ bool sinsp_container_engine_docker::parse_docker(sinsp_container_manager* manage
switch(resp) {
case sinsp_docker_response::RESP_BAD_REQUEST:
m_api_version = "";
json = "";
#ifndef CYGWING_AGENT
resp = get_docker(manager, "http://localhost/containers/" + container->m_id + "/json", json);
#else
Expand Down Expand Up @@ -188,8 +189,9 @@ bool sinsp_container_engine_docker::parse_docker(sinsp_container_manager* manage
container->m_imageid = imgstr.substr(cpos + 1);
}

bool no_name = strncmp(container->m_image.c_str(), container->m_imageid.c_str(),
MIN(container->m_image.length(), container->m_imageid.length())) == 0;
bool no_name = !container->m_imageid.empty() &&
strncmp(container->m_image.c_str(), container->m_imageid.c_str(),
MIN(container->m_image.length(), container->m_imageid.length())) == 0;
if(!no_name || !m_query_image_info)
{
string hostname, port;
Expand All @@ -202,7 +204,8 @@ bool sinsp_container_engine_docker::parse_docker(sinsp_container_manager* manage
false);
}

if(m_query_image_info && (no_name || container->m_imagedigest.empty() || container->m_imagetag.empty()))
if(m_query_image_info && !container->m_imageid.empty() &&
(no_name || container->m_imagedigest.empty() || (!container->m_imagedigest.empty() && container->m_imagetag.empty())))
{
string img_json;
#ifndef CYGWING_AGENT
Expand Down