aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-03-06 13:23:53 -0500
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-03-06 13:24:34 -0500
commit50423a9c3c440e0cf94c0b69a39c640343335948 (patch)
treea152176575a393e6717ad6379909b8f4500e1a80
parentf2ef07fcf776b089db5c5dbcef4ada78f52295d5 (diff)
downloadstasis-50423a9c3c440e0cf94c0b69a39c640343335948.tar.gz
Add paths for build_docker_dir and docker_artifact_dir
-rw-r--r--include/deliverable.h2
-rw-r--r--src/deliverable.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/deliverable.h b/include/deliverable.h
index 1fbbd54..41f65c1 100644
--- a/include/deliverable.h
+++ b/include/deliverable.h
@@ -58,6 +58,7 @@ struct Delivery {
char *conda_artifact_dir; ///< Base path to store compiled conda packages
char *conda_staging_dir; ///< Base path to copy compiled conda packages
char *conda_staging_url; ///< URL to access compiled conda packages
+ char *docker_artifact_dir; ///< Base path to store saved docker images
char *wheel_artifact_dir; ///< Base path to store compiled wheel packages (Unused)
char *wheel_staging_dir; ///< Base path to copy compiled wheel packages (Unused)
char *wheel_staging_url; ///< URL to access compiled wheel packages (Unused)
@@ -65,6 +66,7 @@ struct Delivery {
char *build_recipes_dir; ///< Path to store conda recipes
char *build_sources_dir; ///< Path to store source code
char *build_testing_dir; ///< Path to store test data (Unused)
+ char *build_docker_dir; ///< Path to store docker build script
} storage;
/*! \struct Meta
diff --git a/src/deliverable.c b/src/deliverable.c
index 3f0efc1..e2df64a 100644
--- a/src/deliverable.c
+++ b/src/deliverable.c
@@ -212,12 +212,14 @@ void delivery_init_dirs(struct Delivery *ctx) {
path_store(&ctx->storage.build_recipes_dir, PATH_MAX, ctx->storage.build_dir, "recipes");
path_store(&ctx->storage.build_sources_dir, PATH_MAX, ctx->storage.build_dir, "sources");
path_store(&ctx->storage.build_testing_dir, PATH_MAX, ctx->storage.build_dir, "testing");
+ path_store(&ctx->storage.build_docker_dir, PATH_MAX, ctx->storage.build_dir, "docker");
path_store(&ctx->storage.output_dir, PATH_MAX, ctx->storage.root, "output");
path_store(&ctx->storage.delivery_dir, PATH_MAX, ctx->storage.output_dir, "delivery");
path_store(&ctx->storage.package_dir, PATH_MAX, ctx->storage.output_dir, "packages");
path_store(&ctx->storage.conda_artifact_dir, PATH_MAX, ctx->storage.package_dir, "conda");
path_store(&ctx->storage.wheel_artifact_dir, PATH_MAX, ctx->storage.package_dir, "wheels");
+ path_store(&ctx->storage.docker_artifact_dir, PATH_MAX, ctx->storage.package_dir, "docker");
if (!ctx->storage.mission_dir) {
path_store(&ctx->storage.mission_dir, PATH_MAX, globals.sysconfdir, "mission");