aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2025-11-06 08:55:22 -0500
committerJoseph Hunkeler <jhunkeler@gmail.com>2025-11-06 08:55:22 -0500
commitd2e2c5965502f7c320bcc4b4aa16ab66b59db68f (patch)
tree41a8492c7a73648c6bc92a24ef1544b2d6580476
parent7b865d365d36c9c4f2e16fcf51e2fde8a4f0c444 (diff)
downloadstasis-d2e2c5965502f7c320bcc4b4aa16ab66b59db68f.tar.gz
Move docker struct duplication down to jfrog struct duplication
-rw-r--r--src/lib/delivery/delivery.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/delivery/delivery.c b/src/lib/delivery/delivery.c
index 8abae5e..c996b10 100644
--- a/src/lib/delivery/delivery.c
+++ b/src/lib/delivery/delivery.c
@@ -28,15 +28,6 @@ struct Delivery *delivery_duplicate(const struct Delivery *ctx) {
result->conda.tool_build_version = strdup_maybe(ctx->conda.tool_build_version);
result->conda.tool_version = strdup_maybe(ctx->conda.tool_version);
- // Docker
- result->deploy.docker.build_args = strlist_copy(ctx->deploy.docker.build_args);
- result->deploy.docker.tags = strlist_copy(ctx->deploy.docker.tags);
- result->deploy.docker.capabilities = ctx->deploy.docker.capabilities;
- result->deploy.docker.dockerfile = strdup_maybe(ctx->deploy.docker.dockerfile);
- result->deploy.docker.image_compression = strdup_maybe(ctx->deploy.docker.image_compression);
- result->deploy.docker.registry = strdup_maybe(ctx->deploy.docker.registry);
- result->deploy.docker.test_script = strdup_maybe(ctx->deploy.docker.test_script);
-
// Info
result->info.build_name = strdup_maybe(ctx->info.build_name);
result->info.build_number = strdup_maybe(ctx->info.build_number);
@@ -108,6 +99,15 @@ struct Delivery *delivery_duplicate(const struct Delivery *ctx) {
}
}
+ // Docker
+ result->deploy.docker.build_args = strlist_copy(ctx->deploy.docker.build_args);
+ result->deploy.docker.tags = strlist_copy(ctx->deploy.docker.tags);
+ result->deploy.docker.capabilities = ctx->deploy.docker.capabilities;
+ result->deploy.docker.dockerfile = strdup_maybe(ctx->deploy.docker.dockerfile);
+ result->deploy.docker.image_compression = strdup_maybe(ctx->deploy.docker.image_compression);
+ result->deploy.docker.registry = strdup_maybe(ctx->deploy.docker.registry);
+ result->deploy.docker.test_script = strdup_maybe(ctx->deploy.docker.test_script);
+
// Jfrog
// TODO: break out into a separate a function
for (size_t i = 0; i < sizeof(ctx->deploy.jfrog) / sizeof(ctx->deploy.jfrog[0]); i++) {