From 917d51829910743fe189ca31c06ef13f21155448 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Tue, 28 Jul 2020 17:46:34 +0100
Subject: [PATCH] composed envsets

---
 .drone-home.jsonnet | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/.drone-home.jsonnet b/.drone-home.jsonnet
index f7dbd7a..952961e 100644
--- a/.drone-home.jsonnet
+++ b/.drone-home.jsonnet
@@ -185,28 +185,25 @@ local images = {
           },
         },
       ),
-      util.compose(
-        std.map(
-          util.compose(
-            std.map(
-              function(s) util.envSet(s),
-              publicSecrets
-            ) +
-            std.map(
-              function(s) function(step) step {
-                settings +: {
-                  script +: [
-                    "export %(env)s='$${%(env)s}'" % {
-                      env: util.environment(s),
-                    },
-                  ],
-                },
+        util.compose(
+          std.map(
+            function(s) util.envSet(s),
+            publicSecrets
+          ) +
+          std.map(
+            function(s) function(step) step {
+              settings +: {
+                script +: [
+                  "export %(env)s='$${%(env)s}'" % {
+                    env: util.environment(s),
+                  },
+                ],
               },
-              publicSecrets
-            )
-          ),
+            },
+            publicSecrets
+          )
         )
-      )(
+      (
         images.ssh  {
           name: 'deploy portainer',
           settings +: {