mirror of https://github.com/BOINC/boinc.git
dockerwrapper: work dir defaults to /app
This commit is contained in:
parent
160cc3de8e
commit
415696ba6a
|
@ -191,7 +191,7 @@ function create_jobs(
|
|||
$job_cmds .= "$job_cmd\n";
|
||||
}
|
||||
$cmd = sprintf(
|
||||
'cd ../..; bin/create_work --appname %s --batch %d --stdin --command_line "--dockerfile %s" --wu_template %s --result_template %s',
|
||||
'cd ../..; bin/create_work --appname %s --batch %d --stdin --command_line "--dockerfile %s --verbose" --wu_template %s --result_template %s',
|
||||
$boinc_app->name, $batch_id, $variant_desc->dockerfile,
|
||||
"buda_batches/$batch_dir_name/template_in",
|
||||
"buda_batches/$batch_dir_name/template_out"
|
||||
|
|
|
@ -122,6 +122,9 @@ DOCKER_CONN docker_conn;
|
|||
// parse job config file
|
||||
//
|
||||
int parse_config_file() {
|
||||
// defaults
|
||||
config.workdir = "/app";
|
||||
|
||||
std::ifstream ifs(config_file);
|
||||
if (ifs.fail()) {
|
||||
fprintf(stderr, "no job.toml config file\n");
|
||||
|
@ -137,8 +140,6 @@ int parse_config_file() {
|
|||
x = v.find("workdir");
|
||||
if (x) {
|
||||
config.workdir = x->as<string>();
|
||||
} else {
|
||||
config.workdir = "/app";
|
||||
}
|
||||
x = v.find("project_dir_mount");
|
||||
if (x) {
|
||||
|
|
Loading…
Reference in New Issue