feat: improve machine type detection for containers (Version 2.8.12)

Author: jmrenouard

CURRENT_VERSION.txt

@@ -1 +1 @@
-2.8.11
+2.8.12

Changelog

@@ -1,3 +1,9 @@
+2.8.12 2026-01-17
+
+- feat: improve machine type detection to report 'Container' instead of 'Virtual machine' in containers
+- feat: update is_docker() to detect containerd and podman runtimes
+- chore: bump version to 2.8.12
+
 2.8.11 2026-01-17
 
 - docs: update INTERNALS.md with information about Cloud, SSH, Containers, and Plugins

mysqltuner.pl

@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# mysqltuner.pl - Version 2.8.11
+# mysqltuner.pl - Version 2.8.12
 # High Performance MySQL Tuning Script
 # Copyright (C) 2015-2023 Jean-Marie Renouard - jmrenouard@gmail.com
 # Copyright (C) 2006-2023 Major Hayden - major@mhtx.net
@@ -59,7 +59,7 @@ package main;
 my $is_win = $^O eq 'MSWin32';
 
 # Set up a few variables for use in the script
-my $tunerversion = "2.8.11";
+my $tunerversion = "2.8.12";
 my ( @adjvars, @generalrec );
 
 # Set defaults
@@ -395,14 +395,17 @@ ()
     if ( -f '/proc/self/cgroup' ) {
         if ( open( my $fh, '<', '/proc/self/cgroup' ) ) {
             while ( my $line = <$fh> ) {
-                if ( $line =~ /docker|kubepods/ ) {
+                if ( $line =~ /docker|kubepods|containerd|podman/ ) {
                     close $fh;
                     return 1;
                 }
             }
             close $fh;
         }
     }
+    return 1
+      if ( defined $ENV{'container'}
+        && $ENV{'container'} =~ /^(docker|podman|lxc)$/ );
     return 0;
 }
 
@@ -2313,7 +2316,11 @@ sub get_kernel_info {
 sub get_system_info {
     $result{'OS'}{'Release'} = get_os_release();
     infoprint get_os_release;
-    if (is_virtual_machine) {
+    if (is_docker()) {
+        infoprint "Machine type          : Container";
+        $result{'OS'}{'Virtual Machine'} = 'YES';
+    }
+    elsif (is_virtual_machine) {
         infoprint "Machine type          : Virtual machine";
         $result{'OS'}{'Virtual Machine'} = 'YES';
     }
@@ -8287,7 +8294,7 @@ =head1 OUTPUT OPTIONS
 
 =head1 VERSION
 
-Version 2.8.11
+Version 2.8.12
 =head1 PERLDOC
 
 You can find documentation for this module with the perldoc command.

tests/machine_type.t

@@ -0,0 +1,26 @@
+use strict;
+use warnings;
+use Test::More;
+
+# Mocking the logic that will be in mysqltuner.pl
+sub mock_get_system_info_logic {
+    my ($is_container, $is_vm) = @_;
+    my $machine_type = "";
+    if ($is_container) {
+        $machine_type = "Container";
+    }
+    elsif ($is_vm) {
+        $machine_type = "Virtual machine";
+    }
+    else {
+        $machine_type = "Physical machine";
+    }
+    return $machine_type;
+}
+
+is(mock_get_system_info_logic(1, 1), "Container", "Container on VM should be reported as Container");
+is(mock_get_system_info_logic(1, 0), "Container", "Container on Physical should be reported as Container");
+is(mock_get_system_info_logic(0, 1), "Virtual machine", "VM should be reported as Virtual machine");
+is(mock_get_system_info_logic(0, 0), "Physical machine", "Physical should be reported as Physical machine");
+
+done_testing();