Skip to content

Commit 1997a2a

Browse files
committed
Added support for cgroup v2
1 parent 99607b9 commit 1997a2a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ Thumbs.db
4040
*.dotCover
4141
appsettings.demo.json
4242
.vs
43+
.idea/.idea.CoreHelpers.Azure.Worker/.idea

CoreHelpers.Azure.Worker/Hosting/WorkerHostingEnvironment.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ public bool IsRunningInContainerEnvironment()
3838
var cGroupContent = File.ReadAllText("/proc/1/cgroup");
3939

4040
// set the cache value
41-
cachedCheckIsRunningInContainerEnvironment = cGroupContent.Contains("/docker/") || cGroupContent.Contains("/kubepods/");
41+
cachedCheckIsRunningInContainerEnvironment = cGroupContent.Contains("/docker/") || cGroupContent.Contains("/kubepods/") || cGroupContent.Contains("kubepods.slice");
42+
if (!cachedCheckIsRunningInContainerEnvironment.Value)
43+
cachedCheckIsRunningInContainerEnvironment = File.Exists("/var/run/secrets/kubernetes.io/serviceaccount/token");
4244

4345
// return the value
4446
return cachedCheckIsRunningInContainerEnvironment.Value;

0 commit comments

Comments
 (0)