From 1e2d4d6d001bc36522ce174c4e2dea46f9e1cc45 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Tue, 28 Apr 2020 20:22:17 +0100 Subject: [PATCH] . --- drone-starlark/repos/deploy.star | 3 ++- drone-starlark/repos/stack/drone.star | 4 +++- drone-starlark/repos/stack/public-secrets.star | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star index f51d63e..6fd969f 100644 --- a/drone-starlark/repos/deploy.star +++ b/drone-starlark/repos/deploy.star @@ -8,6 +8,7 @@ def deploy( name, folder, secrets, + commands, ): return { "name": "deploy", @@ -29,6 +30,6 @@ def deploy( "docker stack rm {name}".format(name = name), "sleep 30", "docker stack deploy -c {filename} {name}".format(name= name, filename = filename), - ] + ] + commands } } diff --git a/drone-starlark/repos/stack/drone.star b/drone-starlark/repos/stack/drone.star index 0f706e9..5891b9b 100644 --- a/drone-starlark/repos/stack/drone.star +++ b/drone-starlark/repos/stack/drone.star @@ -22,6 +22,7 @@ def drone( branch, base, name, + commands, ): if ctx.build.branch == branch: return [ @@ -64,7 +65,8 @@ def drone( "docker-compose-home.yml", name, base, - publicSecrets + secretSecrets + publicSecrets + secretSecrets, + commands ), ], diff --git a/drone-starlark/repos/stack/public-secrets.star b/drone-starlark/repos/stack/public-secrets.star index 55a4ace..e51a225 100644 --- a/drone-starlark/repos/stack/public-secrets.star +++ b/drone-starlark/repos/stack/public-secrets.star @@ -5,6 +5,7 @@ publicSecrets = [ "drone-domain", "drone-gitea-client-id", "drone-gitea-server", + "drone-server-host", "git-domain", "local-docker-registry", "remote-domain",