Merge pull request liske#234 from lazyfrosch/fix/docker-scopes

container: fix docker detection with cgroups v2
lathiat · Feb 13, 2022 · a91d3d4 · a91d3d4
2 parents fda1a0c + c250c90
commit a91d3d4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/perl/lib/NeedRestart/CONT/docker.pm b/perl/lib/NeedRestart/CONT/docker.pm
@@ -67,9 +67,9 @@ sub check {
     }
 
     # look for docker cgroups
-    return 0 unless($cg =~ /^\d+:[^:]+:\/system.slice\/docker-(.+)\.scope$/m ||
-                    $cg =~ /^\d+:[^:]+:\/system.slice\/docker\.service$/m ||
-                    $cg =~ /^\d+:[^:]+:\/docker\/([\da-f]+)$/m);
+    return 0 unless($cg =~ /^\d+:[^:]*:\/system.slice\/docker-(.+)\.scope$/m ||
+                    $cg =~ /^\d+:[^:]*:\/system.slice\/docker\.service$/m ||
+                    $cg =~ /^\d+:[^:]*:\/docker\/([\da-f]+)$/m);
 
     print STDERR "$LOGPREF #$pid is part of docker container '$1' and will be ignored\n" if($self->{debug});