From aa0a61a049c9bdfea0f31570ec891d2ed8ce775d Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Wed, 6 Mar 2024 16:59:39 -0500
Subject: Refactor deployment structure

* Consolidate jfrog and docker into deploy member
* Fix template registers
---
 include/deliverable.h | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'include/deliverable.h')

diff --git a/include/deliverable.h b/include/deliverable.h
index 41f65c1..0aad8ab 100644
--- a/include/deliverable.h
+++ b/include/deliverable.h
@@ -137,20 +137,24 @@ struct Delivery {
     } tests[1000]; ///< An array of tests
 
     struct Deploy {
-        struct StrList *files;
-        struct JFRT_Auth auth_ctx;
-        struct JFRT_Upload upload_ctx;
-        char *repo;
-        char *dest;
-    } deploy[1000];
-
-    struct Docker {
-        struct DockerCapabilities capabilities;
-        char *dockerfile;
-        char *registry;
-        struct StrList *build_args;
-        struct StrList *tags;
-    } docker;
+        struct JFrog {
+            struct StrList *files;
+            struct JFRT_Auth auth_ctx;
+            struct JFRT_Upload upload_ctx;
+            char *repo;
+            char *dest;
+        } jfrog[1000];
+
+        struct Docker {
+            struct DockerCapabilities capabilities;
+            char *image_compression;
+            char *dockerfile;
+            char *registry;
+            char *test_script;
+            struct StrList *build_args;
+            struct StrList *tags;
+        } docker;
+    } deploy;
 
     struct Rule {
         struct INIFILE *_handle;
-- 
cgit