Updated cmd for docker version check and added podman version check

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
adoptium · Jun 4, 2024 · f2d560b · f2d560b
1 parent 8cf4d64
commit f2d560b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/org/openj9/envInfo/MachineInfo.java b/src/org/openj9/envInfo/MachineInfo.java
@@ -49,7 +49,6 @@ public class MachineInfo {
 	public static final String[] CPU_CORES_CMD_SOLARIS = new String[] {"bash", "-c", "psrinfo | wc -l"};
 	public static final String[] NUMA_CMD = new String[] {"bash", "-c", "numactl --show | grep 'No NUMA support available on this system"};
 	public static final String[] SYS_VIRT_CMD = new String[] {""};
-	public static final String[] CHECK_DOCKER_CMD = new String[] {"bash", "-c", "if grep -sq 'docker\\|lxc' /proc/1/cgroup; then echo 'running on docker'; else echo 'not on docker'; fi"};
 
 	// Software
 	public static final String[] SYS_OS_CMD = new String[] {"uname", "-s"};
@@ -63,6 +62,8 @@ public class MachineInfo {
 	public static final String[] MAKE_VERSION_CMD = new String[] {"bash", "-c", "make --version"};
 	public static final String[] PERL_VERSION_CMD = new String[] {"bash", "-c", "perl --version"};
 	public static final String[] CURL_VERSION_CMD = new String[] {"bash", "-c", "curl --version"};
+	public static final String[] DOCKER_VERSION_CMD = new String[] {"bash", "-c", "docker --version"};
+	public static final String[] PODMAN_VERSION_CMD = new String[] {"bash", "-c", "podman --version"};
 
 
 	// Console
@@ -230,6 +231,7 @@ private void getSysInfo() {
 		putInfo(new Info("sysOS", SYS_OS_CMD, ce.execute(SYS_OS_CMD), null));
 		putInfo(new Info("ulimit", ULIMIT_CMD, ce.execute(ULIMIT_CMD), null));
 		putInfo(new Info("docker", CHECK_DOCKER_CMD, ce.execute(CHECK_DOCKER_CMD), null));
+		putInfo(new Info("podman", CHECK_PODMAN_CMD, ce.execute(CHECK_PODMAN_CMD), null));
 	}
 
 	private void getOsLabel() {