.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Giles Bradshaw 2020-04-27 16:30:56 +01:00
parent 6f82de569e
commit c8799a03c6
3 changed files with 37 additions and 7 deletions

View File

@ -90,12 +90,12 @@ def main(ctx):
#build("letsencrypt-nginx"), #build("letsencrypt-nginx"),
build("drone-starlark"), build("drone-starlark"),
#buildHome(), #buildHome(),
buildDockerFolder( #buildDockerFolder(
"Dockerfile.home", # "Dockerfile.home",
"nginx:latest", # "nginx:latest",
"home", # "home",
"letsencrypt-nginx" # "letsencrypt-nginx"
), #),
buildDockerFolder( buildDockerFolder(
"Dockerfile.blog", "Dockerfile.blog",

View File

@ -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,
),
],
}

View File

@ -21,7 +21,7 @@ def buildDockerFolder(
]), ]),
"commands": [ "commands": [
"cd {folder}".format(folder=folder), "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, image = image,
dockerFile = dockerFile, dockerFile = dockerFile,
tag = tag, tag = tag,