Merge pull request #55 from jhunkeler/per-mission-base-env

Default mission environment(s)

2 files changed, 55 insertions, 3 deletions

diff --git a/src/delivery_install.c b/src/delivery_install.c
index a7754e8..76c3f4a 100644
--- a/src/delivery_install.c
+++ b/src/delivery_install.c
@@ -99,8 +99,12 @@ int delivery_overlay_packages_from_env(struct Delivery *ctx, const char *env_nam
             }
         }
     }
-    guard_strlist_free(&ctx->conda.pip_packages);
-    ctx->conda.pip_packages = strlist_copy(new_list);
+
+    // Replace the package manifest as needed
+    if (strlist_count(new_list)) {
+        guard_strlist_free(&ctx->conda.pip_packages);
+        ctx->conda.pip_packages = strlist_copy(new_list);
+    }
     guard_strlist_free(&new_list);
     guard_strlist_free(&frozen_list);
     return 0;
diff --git a/src/stasis_main.c b/src/stasis_main.c
index 737fafc..eecc419 100644
--- a/src/stasis_main.c
+++ b/src/stasis_main.c
@@ -495,14 +495,60 @@ int main(int argc, char *argv[]) {
         pathvar = NULL;
     }
 
+
+    //
+    // Implied environment creation modes/actions
+    //
+    // 1. No base environment config
+    //   1a. Caller is warned
+    //   1b. Caller has full control over all packages
+    // 2. Default base environment (etc/stasis/mission/[name]/base.yml)
+    //   2a. Depends on packages defined by base.yml
+    //   2b. Caller may issue a reduced package set in the INI config
+    //   2c. Caller must be vigilant to avoid incompatible packages (base.yml
+    //       *should* have no version constraints)
+    // 3. External base environment (based_on=schema://[release_name].yml)
+    //   3a. Depends on a previous release or arbitrary yaml configuration
+    //   3b. Bugs, conflicts, and dependency resolution issues are inherited and
+    //       must be handled in the INI config
     msg(STASIS_MSG_L1, "Creating release environment(s)\n");
+
+    char *mission_base = NULL;
+    if (isempty(ctx.meta.based_on)) {
+        guard_free(ctx.meta.based_on);
+        char *mission_base_orig = NULL;
+
+        if (asprintf(&mission_base_orig, "%s/%s/base.yml", ctx.storage.mission_dir, ctx.meta.mission) < 0) {
+            SYSERROR("Unable to allocate bytes for %s/%s/base.yml path\n", ctx.storage.mission_dir, ctx.meta.mission);
+            exit(1);
+        }
+
+        if (access(mission_base_orig, F_OK) < 0) {
+            msg(STASIS_MSG_L2 | STASIS_MSG_WARN, "Mission does not provide a base.yml configuration: %s (%s)\n",
+                ctx.meta.mission, ctx.storage.mission_dir);
+        } else {
+            msg(STASIS_MSG_L2, "Using base environment configuration: %s\n", mission_base_orig);
+            if (asprintf(&mission_base, "%s/%s-base.yml", ctx.storage.tmpdir, ctx.info.release_name) < 0) {
+                SYSERROR("%s", "Unable to allocate bytes for temporary base.yml configuration");
+                remove(mission_base);
+                exit(1);
+            }
+            copy2(mission_base_orig, mission_base, CT_OWNER | CT_PERM);
+            char spec[255] = {0};
+            snprintf(spec, sizeof(spec) - 1, "- python=%s\n", ctx.meta.python);
+            file_replace_text(mission_base, "- python\n", spec, 0);
+            ctx.meta.based_on = mission_base;
+        }
+        guard_free(mission_base_orig);
+    }
+
     if (!isempty(ctx.meta.based_on)) {
         if (conda_env_remove(env_name)) {
             msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed to remove release environment: %s\n", env_name);
             exit(1);
         }
 
-        msg(STASIS_MSG_L2, "Based on release: %s\n", ctx.meta.based_on);
+        msg(STASIS_MSG_L2, "Based on: %s\n", ctx.meta.based_on);
         if (conda_env_create_from_uri(env_name, ctx.meta.based_on)) {
             msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "unable to install release environment using configuration file\n");
             exit(1);
@@ -526,6 +572,8 @@ int main(int argc, char *argv[]) {
             exit(1);
         }
     }
+    // The base environment configuration not used past this point
+    remove(mission_base);
 
     // Activate test environment
     msg(STASIS_MSG_L1, "Activating test environment\n");