From 1455b11a0c694e3cb0db91632d8f5557ab2b22b8 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Thu, 30 Apr 2020 21:04:50 +0100 Subject: [PATCH] . --- drone-starlark/repos/pull.star | 3 ++- drone-starlark/repos/stack/drone.star | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drone-starlark/repos/pull.star b/drone-starlark/repos/pull.star index 2b74bdb..c0acd4e 100644 --- a/drone-starlark/repos/pull.star +++ b/drone-starlark/repos/pull.star @@ -4,11 +4,12 @@ load("@this//:environment.star", "environment") load("@this//:export.star", "export") def pull( + name, images, ): secrets = [ "local-docker-registry"] return { - "name": "pull", + "name": name, "image": "appleboy/drone-ssh", "environment": environment(secrets), "settings": { diff --git a/drone-starlark/repos/stack/drone.star b/drone-starlark/repos/stack/drone.star index 9769f30..297e5fd 100644 --- a/drone-starlark/repos/stack/drone.star +++ b/drone-starlark/repos/stack/drone.star @@ -32,7 +32,9 @@ def drone( [ wait(15, "wait"), build("drone-starlark"), - pull([ + pull( + "pull drone", + [ "drone-starlark", ]), rescale( @@ -64,13 +66,16 @@ def drone( # "drone", #), scp(base), - pull([ - "ghost", - "ngrok-gitea", - "letsencrypt-git", - "letsencrypt-drone", - "guacamole-postgresql", - ]), + pull( + "pull images", + [ + "ghost", + "ngrok-gitea", + "letsencrypt-git", + "letsencrypt-drone", + "guacamole-postgresql", + ], + ), deploy( "docker-compose-home.yml", name,