diff --git a/.drone.star b/.drone.star index 86c83e5..e6007ec 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,6 @@ -def fromSecret(name): - return { - "from_secret": name - } +load("@this//:from-secret.star", "fromSecret") +load("@this//:print-secrets.star", "printSecrets") + def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] @@ -25,24 +24,6 @@ def export(secret): return "export {toCaps}=${toCaps}".format( toCaps = secretToEnvironment(secret), ) -def printSecrets(filename, env, secretEnv): - - return { - "name": "print secrets", - "image": "appleboy/drone-ssh", - "environment": environment(env), - "settings": { - "envs": [x.replace("-", "_") for x in env ], - "host": fromSecret("ssh-host"), - "port": fromSecret("ssh-port"), - "username": fromSecret("ssh-user"), - "password": fromSecret("ssh-password"), - "script": [x.replace("***filename***", filename) for x in [ - "rm -f env-stack", - ] + map(echo, env) - + map(echoSecret, secretEnv)] - } - } def wait(delay, name): return { "name": name, @@ -176,7 +157,7 @@ def deploy( "docker network prune -f", "cd {folder}".format(folder=folder), "docker stack rm gitea", - "sleep 60", + "sleep 30", "docker stack deploy -c {filename} gitea".format(filename = filename), ] }