diff --git a/db/boinc_db_types.h b/db/boinc_db_types.h index c798764a54ebab7884f12b03cd00b17ca9eca55c..7da5d135fa832793550418ff8302635af102e4a3 100644 --- a/db/boinc_db_types.h +++ b/db/boinc_db_types.h @@ -379,11 +379,10 @@ struct HOST { WSL_DISTROS wsl_distros; // Docker info (non-Win only) - bool docker_available; - // present and allowed by config - bool docker_compose_available; char docker_version[256]; + int docker_type; char docker_compose_version[256]; + int docker_compose_type; // stuff from time_stats double cpu_and_network_available_frac; diff --git a/sched/sched_types.cpp b/sched/sched_types.cpp index 7a50596951b18564dcceba07c2e7ef3f30424520..a948faf8d6e8c15ebda22ab24942a0735cc5a93a 100644 --- a/sched/sched_types.cpp +++ b/sched/sched_types.cpp @@ -1405,10 +1405,10 @@ int HOST::parse(XML_PARSER& xp) { if (xp.parse_double("n_bwup", n_bwup)) continue; if (xp.parse_double("n_bwdown", n_bwdown)) continue; if (xp.parse_str("p_features", p_features, sizeof(p_features))) continue; - if (xp.parse_bool("docker_available", docker_available)) continue; - if (xp.parse_bool("docker_compose_available", docker_compose_available)) continue; if (xp.parse_str("docker_version", docker_version, sizeof(docker_version))) continue; + if (xp.parse_int("docker_type", docker_type)) continue; if (xp.parse_str("docker_compose_version", docker_compose_version, sizeof(docker_compose_version))) continue; + if (xp.parse_int("docker_compose_type", docker_compose_type)) continue; if (xp.parse_str("virtualbox_version", virtualbox_version, sizeof(virtualbox_version))) continue; if (xp.parse_bool("p_vm_extensions_disabled", p_vm_extensions_disabled)) continue; if (xp.match_tag("opencl_cpu_prop")) {