Merge pull request #145 from rage/sandbox-image

added support for sandbox_image in tmcproject

Author: Heliozoa

docs/tmcproject.md

@@ -13,6 +13,7 @@ All of the keys listed below are optional.
 | no-tests               | Boolean OR Map "points" -> List of string OR integer | If set to true or a map, the no-tests plugin is used for the exercise. If set to a list, the list will be used as the exercise's points.                                             |
 | fail_on_valgrind_error | Boolean                                              | If set, the C plugin will attempt to run valgrind and fail the exercise if it discovers errors.                                                                                      |
 | minimum_python_version | Python version string                                | Must be "{major}.{minor}.{patch}", "{major}.{minor}" or "{major}". If set, the Python plugin will warn the user if the Python version being used is below the given minimum version. |
+| sandbox_image | The Docker image that should be used at the sandbox. | Should be a URL. |
 
 ## Example file contents
 
@@ -32,6 +33,7 @@ no-tests:
     - point
 fail_on_valgrind_error: false
 minimum_python_version: "3.8"
+sandbox_image: "eu.gcr.io/moocfi-public/best-image"
 ```
 
 ## Default student and exercise files

tmc-langs-framework/src/tmc_project_yml.rs

@@ -42,6 +42,10 @@ pub struct TmcProjectYml {
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub minimum_python_version: Option<PythonVer>,
+
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_image: Option<String>,
 }
 
 impl TmcProjectYml {

tmc-langs/src/course_refresher.rs

@@ -89,7 +89,7 @@ pub fn refresh_course(
         .collect::<Vec<_>>();
 
     // collect .tmcproject.ymls and merge the root config with each exercise's, if any
-    let root_tmcproject_yml = TmcProjectYml::load(&course_cache_path)?;
+    let root_tmcproject_yml = TmcProjectYml::load(&new_clone_path)?;
     let exercise_dirs_and_tmcprojects =
         get_and_merge_tmcproject_configs(root_tmcproject_yml, &new_clone_path, exercise_dirs)?;
     progress_stage("Merged .tmcproject.yml files in exercise directories to the root file, if any");