Skip to content

Commit 843e961

Browse files
committed
fix(deps): apply patch to enable podman on scap files
Signed-off-by: Roberto Scolaro <[email protected]>
1 parent 598ad29 commit 843e961

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

cmake/modules/falcosecurity-libs-repo/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ ExternalProject_Add(
3131
BUILD_COMMAND ""
3232
INSTALL_COMMAND ""
3333
TEST_COMMAND ""
34+
PATCH_COMMAND sh -c "patch -p1 <${CMAKE_SOURCE_DIR}/podman.patch"
3435
)
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/userspace/libsinsp/container_engine/docker/podman.cpp b/userspace/libsinsp/container_engine/docker/podman.cpp
2+
index e42f2c7bd..69ffef033 100644
3+
--- a/userspace/libsinsp/container_engine/docker/podman.cpp
4+
+++ b/userspace/libsinsp/container_engine/docker/podman.cpp
5+
@@ -193,7 +193,15 @@ bool podman::resolve(sinsp_threadinfo *tinfo, bool query_os_for_missing_info)
6+
7+
if(m_api_sock_can_exist == nullptr)
8+
{
9+
- m_api_sock_can_exist.reset(new bool(can_api_sock_exist()));
10+
+ if (query_os_for_missing_info)
11+
+ {
12+
+ m_api_sock_can_exist = can_api_sock_exist();
13+
+ }
14+
+ else
15+
+ {
16+
+ // Short-circuit: always enable podman when running from a capture file.
17+
+ m_api_sock_can_exist = true;
18+
+ }
19+
}
20+
21+
if(! (*(m_api_sock_can_exist.get())))
22+
diff --git a/userspace/libsinsp/sinsp_filtercheck_container.cpp b/userspace/libsinsp/sinsp_filtercheck_container.cpp
23+
index 40f4de0ea..1cf79d36c 100644
24+
--- a/userspace/libsinsp/sinsp_filtercheck_container.cpp
25+
+++ b/userspace/libsinsp/sinsp_filtercheck_container.cpp
26+
@@ -344,6 +344,9 @@ uint8_t* sinsp_filter_check_container::extract_single(sinsp_evt *evt, OUT uint32
27+
case sinsp_container_type::CT_BPM:
28+
m_tstr = "bpm";
29+
break;
30+
+ case sinsp_container_type::CT_PODMAN:
31+
+ m_tstr = "podman";
32+
+ break;
33+
default:
34+
ASSERT(false);
35+
break;

0 commit comments

Comments
 (0)