composed envsets

2020-07-28 17:45:30 +01:00 · 2020-07-28 17:45:30 +01:00 · 03665f3a6a
parent 649f6bac47
commit 03665f3a6a
1 changed files with 17 additions and 12 deletions
--- a/.drone-home.jsonnet
+++ b/.drone-home.jsonnet
@ -187,19 +187,24 @@ local images = {
      ),
      util.compose(
        std.map(
-          util.compose([
-            function(s) util.envSet(s),
-            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  {