From fb17748b4952ee5f883bd44a9aad88e943e20a56 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Tue, 28 Apr 2020 09:27:15 +0100 Subject: [PATCH] . --- drone-starlark/repos/deploy.star | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star index 3286f54..f51d63e 100644 --- a/drone-starlark/repos/deploy.star +++ b/drone-starlark/repos/deploy.star @@ -2,20 +2,19 @@ load("@this//:from-secret.star", "fromSecret") load("@this//:map.star", "map") load("@this//:environment.star", "environment") load("@this//:export.star", "export") -load("@this//:public-secrets.star", "publicSecrets") -load("@this//:secret-secrets.star", "secretSecrets") def deploy( filename, name, folder, + secrets, ): return { "name": "deploy", "image": "appleboy/drone-ssh", - "environment": environment(publicSecrets + secretSecrets), + "environment": environment(secrets), "settings": { - "envs": [x.replace("-", "_") for x in publicSecrets + secretSecrets ], + "envs": [x.replace("-", "_") for x in secrets ], "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-root-user"), @@ -23,7 +22,7 @@ def deploy( "script": [ "set -e" ] + - map(export, publicSecrets + secretSecrets) + + map(export, secrets) + [ "docker network prune -f", "cd {folder}".format(folder=folder),