From d2e2c5965502f7c320bcc4b4aa16ab66b59db68f Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 6 Nov 2025 08:55:22 -0500 Subject: Move docker struct duplication down to jfrog struct duplication --- src/lib/delivery/delivery.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/lib/delivery') 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++) { -- cgit