public/dropshell
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
j
2025-12-30 08:54:11 +13:00
parent b0d11eb08c
commit 30fa728f96
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/src/templates.cpp
View File

@@ -800,7 +800,7 @@ For full documentation, see: dropshell help templates
ordered_env_vars all_env_vars;
std::vector<std::string> env_files = {
"config/" + filenames::service_env,
"config/" + filenames::template_info_env
filenames::template_info_env
};
for (const auto& file : env_files) {
{ // load service.env from the service on this machine.
@@ -812,22 +812,19 @@ For full documentation, see: dropshell help templates
}
}
// determine template name.
auto it = find_var(all_env_vars, "TEMPLATE");
if (it == all_env_vars.end()) {
error << "TEMPLATE variable not found in " << template_path << std::endl;
return false;
}
std::vector<std::string> required_vars = {
"REQUIRES_HOST_ROOT",
"REQUIRES_DOCKER",
"REQUIRES_DOCKER_ROOT"
};
std::string env_template_name = it->second;
if (env_template_name.empty()) {
error << "TEMPLATE variable is empty in " << template_path << std::endl;
return false;
}
if (env_template_name != template_name) {
error << "TEMPLATE variable is wrong in " << template_path << std::endl;
return false;
for (const auto & required_var : required_vars)
{
auto it = find_var(all_env_vars, required_var);
if (it == all_env_vars.end()) {
error << "Required variable "<< required_var<<" not defined in " << template_path << std::endl;
return false;
}
}
return true;