From 3b7629b84911681b36f0135177de129a9f6571b6 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:06:03 +0100 Subject: [PATCH] . --- drone-starlark/repos/build-docker-folder-temp.star | 7 ++++--- drone-starlark/repos/build-docker-folder.star | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drone-starlark/repos/build-docker-folder-temp.star b/drone-starlark/repos/build-docker-folder-temp.star index b020826..90d5f98 100644 --- a/drone-starlark/repos/build-docker-folder-temp.star +++ b/drone-starlark/repos/build-docker-folder-temp.star @@ -4,10 +4,11 @@ def buildDockerFolder( image, tag, folder, + name, ): return { - "name": "build-{tag}".format( - tag = tag, + "name": "build-{name}".format( + name = name, ), "image": "docker:dind", "volumes": [ @@ -21,7 +22,7 @@ def buildDockerFolder( ]), "commands": [ "cd {folder}".format(folder=folder), - "sh build-docker-folder.sh {dockerFile} $${{LOCAL_DOCKER_REGISTRY}}{image} $${{LOCAL_DOCKER_REGISTRY}}{tag}".format( + "sh build-docker-folder.sh {dockerFile} {image} {tag}".format( image = image, dockerFile = dockerFile, tag = tag, diff --git a/drone-starlark/repos/build-docker-folder.star b/drone-starlark/repos/build-docker-folder.star index dedcbdd..90d5f98 100644 --- a/drone-starlark/repos/build-docker-folder.star +++ b/drone-starlark/repos/build-docker-folder.star @@ -4,10 +4,11 @@ def buildDockerFolder( image, tag, folder, + name, ): return { - "name": "build-{tag}".format( - tag = tag, + "name": "build-{name}".format( + name = name, ), "image": "docker:dind", "volumes": [