Merge branch 'do' into remote
continuous-integration/drone/push Build is running Details

This commit is contained in:
Giles Bradshaw 2020-04-27 15:06:52 +01:00
commit c914194b9e
2 changed files with 22 additions and 37 deletions

View File

@ -33,24 +33,6 @@ def buildHome():
],
}
def buildNginx(name):
return {
"name": "build-nginx-{name}".format(name=name),
"image": "docker:dind",
"volumes": [
{
"name": "dockersock",
"path": "/var/run",
},
],
"environment": environment([
"local-docker-registry",
]),
"commands": [
"cd letsencrypt-nginx",
"sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name),
],
}
def pipeline(name, steps, dependsOn):
return {
"kind": "pipeline",
@ -129,23 +111,4 @@ def main(ctx):
[],
),
]
if ctx.build.branch == 'do':
return [
pipeline(
'do-deploy',
[
build("guacamole-postgresql"),
build("letsencrypt-nginx"),
buildHome(),
buildNginx("blog"),
buildNginx("drone"),
buildNginx("git"),
buildNginx("remote"),
buildNginx("chat"),
scp("~/stack-deploy"),
#deploy("docker-compose-do.yml", "~/stack-deploy"),
],
[],
),
]

View File

@ -0,0 +1,22 @@
load("@this//:environment.star", "environment")
def buildFolder(name, folder):
return {
"name": "build-{folder} {name}".format(
folder=folder,
name=name,
),
"image": "docker:dind",
"volumes": [
{
"name": "dockersock",
"path": "/var/run",
},
],
"environment": environment([
"local-docker-registry",
]),
"commands": [
"cd {folder}".format(folder=folder),
"sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name),
],
}