From c8799a03c683b3a6718a221e9bfede55f68ef7e7 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:30:56 +0100 Subject: [PATCH] . --- .drone.star | 12 ++++---- .../repos/build-docker-folder-temp.star | 30 +++++++++++++++++++ drone-starlark/repos/build-docker-folder.star | 2 +- 3 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 drone-starlark/repos/build-docker-folder-temp.star diff --git a/.drone.star b/.drone.star index c49d76c..93ac023 100644 --- a/.drone.star +++ b/.drone.star @@ -90,12 +90,12 @@ def main(ctx): #build("letsencrypt-nginx"), build("drone-starlark"), #buildHome(), - buildDockerFolder( - "Dockerfile.home", - "nginx:latest", - "home", - "letsencrypt-nginx" - ), + #buildDockerFolder( + # "Dockerfile.home", + # "nginx:latest", + # "home", + # "letsencrypt-nginx" + #), buildDockerFolder( "Dockerfile.blog", diff --git a/drone-starlark/repos/build-docker-folder-temp.star b/drone-starlark/repos/build-docker-folder-temp.star new file mode 100644 index 0000000..b020826 --- /dev/null +++ b/drone-starlark/repos/build-docker-folder-temp.star @@ -0,0 +1,30 @@ +load("@this//:environment.star", "environment") +def buildDockerFolder( + dockerFile, + image, + tag, + folder, +): + return { + "name": "build-{tag}".format( + tag = tag, + ), + "image": "docker:dind", + "volumes": [ + { + "name": "dockersock", + "path": "/var/run", + }, + ], + "environment": environment([ + "local-docker-registry", + ]), + "commands": [ + "cd {folder}".format(folder=folder), + "sh build-docker-folder.sh {dockerFile} $${{LOCAL_DOCKER_REGISTRY}}{image} $${{LOCAL_DOCKER_REGISTRY}}{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 b020826..dedcbdd 100644 --- a/drone-starlark/repos/build-docker-folder.star +++ b/drone-starlark/repos/build-docker-folder.star @@ -21,7 +21,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,