Re: [OpenWrt-Devel] [PATCH v2] procd: add docker support

2019-05-27 Thread Petr Štetiar 
Paul Spooren  [2019-05-27 11:33:29]:

> detects if running in a docker container, which then requires special
> treatment of mounts. OpenWrt within Docker is useful for CI testing.
> 
> Signed-off-by: Paul Spooren 

In case someone would like to take this together with some other procd
changes/patches:

 Acked-by: Petr Štetiar 

-- ynezz

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH v2] procd: add docker support

2019-05-27 Thread Paul Spooren 
detects if running in a docker container, which then requires special
treatment of mounts. OpenWrt within Docker is useful for CI testing.

Signed-off-by: Paul Spooren 
---
 container.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/container.h b/container.h
index d33fa32..dd2e432 100644
--- a/container.h
+++ b/container.h
@@ -16,9 +16,11 @@
 
 #include 
 #include 
+#include 
 
 static inline bool is_container() {
-   return !!getenv("container");
+   struct stat s;
+   return !!getenv("container") || !!stat("/.dockerenv", );
 }
 
 #endif
-- 
2.20.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel