From 0d30c044faf7d049e01b0591c792baf8e7fe1151 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 10 Apr 2024 08:40:20 -0400 Subject: Add docker_validate_image_compression() --- src/deliverable.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/deliverable.c') diff --git a/src/deliverable.c b/src/deliverable.c index 9b20a63..b02deba 100644 --- a/src/deliverable.c +++ b/src/deliverable.c @@ -648,21 +648,10 @@ int delivery_init(struct Delivery *ctx) { tolower_s(item); } } - /* - if (!strcasecmp(ctx->meta.mission, "hst") && ctx->meta.final) { - memset(env_date, 0, sizeof(env_date)); - strftime(env_date, sizeof(env_date) - 1, "%Y%m%d", ctx->info.time_info); - snprintf(env_name, sizeof(env_name) - 1, "%s_%s_%s_%s_py%s_final", - ctx->meta.name, env_date, ctx->system.platform[DELIVERY_PLATFORM_RELEASE], ctx->system.arch, ctx->meta.python_compact); - } else if (!strcasecmp(ctx->meta.mission, "hst")) { - snprintf(env_name, sizeof(env_name) - 1, "%s_%s_%s_%s_py%s_rc%d", - ctx->meta.name, ctx->meta.codename, ctx->system.platform[DELIVERY_PLATFORM_RELEASE], ctx->system.arch, ctx->meta.python_compact, ctx->meta.rc); - } else if (!strcasecmp(ctx->meta.mission, "jwst") && ctx->meta.final) { - snprintf(env_name, sizeof(env_name), "%s_%s_%s_%s_py%s_final", - ctx->meta.name, ctx->meta.version, ctx->system.platform[DELIVERY_PLATFORM_RELEASE], ctx->system.arch, ctx->meta.python_compact); - } else if (!strcasecmp(ctx->meta.mission, "jwst")) { - snprintf(env_name, sizeof(env_name) - 1, "%s_%s_%s_%s_py%s_rc%d", - ctx->meta.name, ctx->meta.version, ctx->system.platform[DELIVERY_PLATFORM_RELEASE], ctx->system.arch, ctx->meta.python_compact, ctx->meta.rc); + + if (docker_validate_compression_program(ctx->deploy.docker.image_compression)) { + SYSERROR("[deploy:docker].image_compression - invalid command / program is not installed: %s", ctx->deploy.docker.image_compression); + return -1; } */ return 0; -- cgit