From c0cd448f332199828937a45658cac86edaae313b Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 15:52:16 +0100 Subject: [PATCH 01/19] . --- .drone.star | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.drone.star b/.drone.star index e1630a9..95d24c7 100644 --- a/.drone.star +++ b/.drone.star @@ -13,6 +13,7 @@ load("@this//:public-secrets.star", "publicSecrets") load("@this//:secret-secrets.star", "secretSecrets") load("@this//:pull.star", "pull") load("@this//:deploy.star", "deploy") +load("@this//:build-folder.star", "buildFolder") def buildHome(): return { @@ -88,11 +89,11 @@ def main(ctx): #build("letsencrypt-nginx"), build("drone-starlark"), #buildHome(), - #buildNginx("blog"), - #buildNginx("drone"), - #buildNginx("git"), - #buildNginx("remote"), - #buildNginx("chat"), + buildFolder("blog", "letsencrypt-nginx"), + buildFolder("drone", "letsencrypt-nginx"), + buildFolder("git", "letsencrypt-nginx"), + buildFolder("remote", "letsencrypt-nginx"), + buildFolder("chat", "letsencrypt-nginx"), scp("~/gitea-drone-stack"), pull([ "letsencrypt-git", From 7b4e97a30a45ecbd1eec9e504ea97471ef454962 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:05:18 +0100 Subject: [PATCH 02/19] . --- drone-starlark/repos/build-docker-folder.star | 31 +++++++++++++++++++ letsencrypt-nginx/build-docker-folder.sh | 3 ++ 2 files changed, 34 insertions(+) create mode 100644 drone-starlark/repos/build-docker-folder.star create mode 100644 letsencrypt-nginx/build-docker-folder.sh diff --git a/drone-starlark/repos/build-docker-folder.star b/drone-starlark/repos/build-docker-folder.star new file mode 100644 index 0000000..baee88c --- /dev/null +++ b/drone-starlark/repos/build-docker-folder.star @@ -0,0 +1,31 @@ +load("@this//:environment.star", "environment") +def buildDockerFolder( + dockerFile, + image, + tag, + folder, +): + return { + "name": "build-{tag}".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-docker-folder.sh {dockerFile} $${{LOCAL_DOCKER_REGISTRY}}{image} $${{LOCAL_DOCKER_REGISTRY}}{tag}".format( + image = image, + dockerFile = dockerFile, + tag = tag, + ), + ], + } diff --git a/letsencrypt-nginx/build-docker-folder.sh b/letsencrypt-nginx/build-docker-folder.sh new file mode 100644 index 0000000..ba7c6a4 --- /dev/null +++ b/letsencrypt-nginx/build-docker-folder.sh @@ -0,0 +1,3 @@ +set -e +docker build . -f $1 --build-arg image=$2 -t $3 +docker push $3 From 9e9669f95ce9eb5ca6011fbb22f316f2afba6ed3 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:11:31 +0100 Subject: [PATCH 03/19] . --- .drone.star | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 95d24c7..a1dc7f7 100644 --- a/.drone.star +++ b/.drone.star @@ -14,6 +14,7 @@ load("@this//:secret-secrets.star", "secretSecrets") load("@this//:pull.star", "pull") load("@this//:deploy.star", "deploy") load("@this//:build-folder.star", "buildFolder") +load("@this//:build-docker-folder.star", "buildDockerFolder") def buildHome(): return { @@ -89,7 +90,12 @@ def main(ctx): #build("letsencrypt-nginx"), build("drone-starlark"), #buildHome(), - buildFolder("blog", "letsencrypt-nginx"), + buildDockerFolder( + "Dockerfile.blog", + "letsencrypt-nginx", + "letsencrypt-blog", + "letsencrypt-nginx" + ), buildFolder("drone", "letsencrypt-nginx"), buildFolder("git", "letsencrypt-nginx"), buildFolder("remote", "letsencrypt-nginx"), From 24c61749e7ffd3126e29f5f7afe801c280cbf989 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:12:59 +0100 Subject: [PATCH 04/19] . --- .drone.star | 14 +++++++------- drone-starlark/repos/build-docker-folder.star | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.drone.star b/.drone.star index a1dc7f7..93c07b8 100644 --- a/.drone.star +++ b/.drone.star @@ -14,7 +14,7 @@ load("@this//:secret-secrets.star", "secretSecrets") load("@this//:pull.star", "pull") load("@this//:deploy.star", "deploy") load("@this//:build-folder.star", "buildFolder") -load("@this//:build-docker-folder.star", "buildDockerFolder") +#load("@this//:build-docker-folder.star", "buildDockerFolder") def buildHome(): return { @@ -90,12 +90,12 @@ def main(ctx): #build("letsencrypt-nginx"), build("drone-starlark"), #buildHome(), - buildDockerFolder( - "Dockerfile.blog", - "letsencrypt-nginx", - "letsencrypt-blog", - "letsencrypt-nginx" - ), + #buildDockerFolder( + # "Dockerfile.blog", + # "letsencrypt-nginx", + # "letsencrypt-blog", + # "letsencrypt-nginx" + #), buildFolder("drone", "letsencrypt-nginx"), buildFolder("git", "letsencrypt-nginx"), buildFolder("remote", "letsencrypt-nginx"), diff --git a/drone-starlark/repos/build-docker-folder.star b/drone-starlark/repos/build-docker-folder.star index baee88c..b020826 100644 --- a/drone-starlark/repos/build-docker-folder.star +++ b/drone-starlark/repos/build-docker-folder.star @@ -7,8 +7,7 @@ def buildDockerFolder( ): return { "name": "build-{tag}".format( - folder=folder, - name=name, + tag = tag, ), "image": "docker:dind", "volumes": [ From ef41cf5f67c815b8e3111c4e266ff67c4269b60f Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:19:23 +0100 Subject: [PATCH 05/19] . --- .drone.star | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.star b/.drone.star index 93c07b8..a1dc7f7 100644 --- a/.drone.star +++ b/.drone.star @@ -14,7 +14,7 @@ load("@this//:secret-secrets.star", "secretSecrets") load("@this//:pull.star", "pull") load("@this//:deploy.star", "deploy") load("@this//:build-folder.star", "buildFolder") -#load("@this//:build-docker-folder.star", "buildDockerFolder") +load("@this//:build-docker-folder.star", "buildDockerFolder") def buildHome(): return { @@ -90,12 +90,12 @@ def main(ctx): #build("letsencrypt-nginx"), build("drone-starlark"), #buildHome(), - #buildDockerFolder( - # "Dockerfile.blog", - # "letsencrypt-nginx", - # "letsencrypt-blog", - # "letsencrypt-nginx" - #), + buildDockerFolder( + "Dockerfile.blog", + "letsencrypt-nginx", + "letsencrypt-blog", + "letsencrypt-nginx" + ), buildFolder("drone", "letsencrypt-nginx"), buildFolder("git", "letsencrypt-nginx"), buildFolder("remote", "letsencrypt-nginx"), From 6f82de569e912deed2b450ff789428af4be81229 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:25:17 +0100 Subject: [PATCH 06/19] . --- .drone.star | 37 ++++++++++++++++++++++++++++++++----- docker-compose-home.yml | 2 +- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.drone.star b/.drone.star index a1dc7f7..c49d76c 100644 --- a/.drone.star +++ b/.drone.star @@ -90,16 +90,43 @@ def main(ctx): #build("letsencrypt-nginx"), build("drone-starlark"), #buildHome(), + buildDockerFolder( + "Dockerfile.home", + "nginx:latest", + "home", + "letsencrypt-nginx" + ), + buildDockerFolder( "Dockerfile.blog", "letsencrypt-nginx", "letsencrypt-blog", "letsencrypt-nginx" ), - buildFolder("drone", "letsencrypt-nginx"), - buildFolder("git", "letsencrypt-nginx"), - buildFolder("remote", "letsencrypt-nginx"), - buildFolder("chat", "letsencrypt-nginx"), + buildDockerFolder( + "Dockerfile.drone", + "letsencrypt-nginx", + "letsencrypt-drone", + "letsencrypt-nginx" + ), + buildDockerFolder( + "Dockerfile.git", + "letsencrypt-nginx", + "letsencrypt-git", + "letsencrypt-nginx" + ), + buildDockerFolder( + "Dockerfile.remote", + "letsencrypt-nginx", + "letsencrypt-remote", + "letsencrypt-nginx" + ), + buildDockerFolder( + "Dockerfile.chat", + "letsencrypt-nginx", + "letsencrypt-chat", + "letsencrypt-nginx" + ), scp("~/gitea-drone-stack"), pull([ "letsencrypt-git", @@ -107,7 +134,7 @@ def main(ctx): "letsencrypt-drone", "letsencrypt-remote", "letsencrypt-blog", - "nginx-home1", + "home", "drone-starlark", ]), deploy( diff --git a/docker-compose-home.yml b/docker-compose-home.yml index bc32a65..2e58413 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -347,7 +347,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${LOCAL_DOCKER_REGISTRY}nginx-home1 + image: ${LOCAL_DOCKER_REGISTRY}home environment: - SERVER_NAME=${BLOG_DOMAIN} ports: From c8799a03c683b3a6718a221e9bfede55f68ef7e7 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:30:56 +0100 Subject: [PATCH 07/19] . --- .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, From 9d964a1e5d2abbc40c0b03cc3246567638029f4b Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:40:36 +0100 Subject: [PATCH 08/19] . --- .drone.star | 2 +- docker-compose-home.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 93ac023..e2197d0 100644 --- a/.drone.star +++ b/.drone.star @@ -134,7 +134,7 @@ def main(ctx): "letsencrypt-drone", "letsencrypt-remote", "letsencrypt-blog", - "home", + "nginx-home1", "drone-starlark", ]), deploy( diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 2e58413..bc32a65 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -347,7 +347,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${LOCAL_DOCKER_REGISTRY}home + image: ${LOCAL_DOCKER_REGISTRY}nginx-home1 environment: - SERVER_NAME=${BLOG_DOMAIN} ports: From 42c3b941556cdcd07e51925d31e276db6bafdf49 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 16:58:29 +0100 Subject: [PATCH 09/19] . --- .drone.star | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.star b/.drone.star index e2197d0..9f29b26 100644 --- a/.drone.star +++ b/.drone.star @@ -99,32 +99,32 @@ def main(ctx): buildDockerFolder( "Dockerfile.blog", - "letsencrypt-nginx", - "letsencrypt-blog", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-blog", "letsencrypt-nginx" ), buildDockerFolder( "Dockerfile.drone", - "letsencrypt-nginx", - "letsencrypt-drone", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-drone", "letsencrypt-nginx" ), buildDockerFolder( "Dockerfile.git", - "letsencrypt-nginx", - "letsencrypt-git", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-git", "letsencrypt-nginx" ), buildDockerFolder( "Dockerfile.remote", - "letsencrypt-nginx", - "letsencrypt-remote", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-remote", "letsencrypt-nginx" ), buildDockerFolder( "Dockerfile.chat", - "letsencrypt-nginx", - "letsencrypt-chat", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", + "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-chat", "letsencrypt-nginx" ), scp("~/gitea-drone-stack"), From 308fceb5a76d72e2dbe16252b6a4640158867ab3 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:01:48 +0100 Subject: [PATCH 10/19] . --- .drone.star | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.star b/.drone.star index 9f29b26..a62a485 100644 --- a/.drone.star +++ b/.drone.star @@ -99,32 +99,32 @@ def main(ctx): buildDockerFolder( "Dockerfile.blog", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-blog", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-blog", "letsencrypt-nginx" ), buildDockerFolder( "Dockerfile.drone", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-drone", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", "letsencrypt-nginx" ), buildDockerFolder( "Dockerfile.git", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-git", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-git", "letsencrypt-nginx" ), buildDockerFolder( "Dockerfile.remote", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-remote", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-remote", "letsencrypt-nginx" ), buildDockerFolder( "Dockerfile.chat", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-nginx", - "$${{LOCAL_DOCKER_REGISTRY}}letsencrypt-chat", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-chat", "letsencrypt-nginx" ), scp("~/gitea-drone-stack"), From 3b7629b84911681b36f0135177de129a9f6571b6 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:06:03 +0100 Subject: [PATCH 11/19] . --- 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": [ From 7338c690de8874850aac629a3da742c7fe2e48cf Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:10:06 +0100 Subject: [PATCH 12/19] . --- .drone.star | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.drone.star b/.drone.star index a62a485..53fee48 100644 --- a/.drone.star +++ b/.drone.star @@ -101,31 +101,36 @@ def main(ctx): "Dockerfile.blog", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-blog", - "letsencrypt-nginx" + "letsencrypt-nginx", + "blog", ), buildDockerFolder( "Dockerfile.drone", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", - "letsencrypt-nginx" + "letsencrypt-nginx", + "drone", ), buildDockerFolder( "Dockerfile.git", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-git", - "letsencrypt-nginx" + "letsencrypt-nginx", + "git", ), buildDockerFolder( "Dockerfile.remote", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-remote", - "letsencrypt-nginx" + "letsencrypt-nginx", + "remote", ), buildDockerFolder( "Dockerfile.chat", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", "$${LOCAL_DOCKER_REGISTRY}letsencrypt-chat", - "letsencrypt-nginx" + "letsencrypt-nginx", + "chat", ), scp("~/gitea-drone-stack"), pull([ From f0594063070dd753d5a1ae7cb993c9387f5a44e1 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:11:32 +0100 Subject: [PATCH 13/19] . --- .drone.star | 14 +++++++------- docker-compose-home.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.star b/.drone.star index 53fee48..8fc7040 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", @@ -139,7 +139,7 @@ def main(ctx): "letsencrypt-drone", "letsencrypt-remote", "letsencrypt-blog", - "nginx-home1", + "home", "drone-starlark", ]), deploy( diff --git a/docker-compose-home.yml b/docker-compose-home.yml index bc32a65..2e58413 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -347,7 +347,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${LOCAL_DOCKER_REGISTRY}nginx-home1 + image: ${LOCAL_DOCKER_REGISTRY}home environment: - SERVER_NAME=${BLOG_DOMAIN} ports: From a02b2de349d1d95763fcf7ab27977c35cde22eef Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:12:32 +0100 Subject: [PATCH 14/19] . --- .drone.star | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 8fc7040..7f8a511 100644 --- a/.drone.star +++ b/.drone.star @@ -94,7 +94,8 @@ def main(ctx): "Dockerfile.home", "nginx:latest", "home", - "letsencrypt-nginx" + "letsencrypt-nginx", + "home", ), buildDockerFolder( From 7e1fc10b0712396dbbd730c057ed36b143d094a2 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:21:33 +0100 Subject: [PATCH 16/19] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 7f8a511..aa2e74a 100644 --- a/.drone.star +++ b/.drone.star @@ -93,7 +93,7 @@ def main(ctx): buildDockerFolder( "Dockerfile.home", "nginx:latest", - "home", + "$${LOCAL_DOCKER_REGISTRY}home", "letsencrypt-nginx", "home", ), From cde071d9720a92af545872b6bcccac2f331f7083 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:54:20 +0100 Subject: [PATCH 17/19] . --- drone-starlark/repos/pipeline.star | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 drone-starlark/repos/pipeline.star diff --git a/drone-starlark/repos/pipeline.star b/drone-starlark/repos/pipeline.star new file mode 100644 index 0000000..ba0b072 --- /dev/null +++ b/drone-starlark/repos/pipeline.star @@ -0,0 +1,40 @@ +def pipeline( + name, + steps, + dependsOn, +): + return { + "kind": "pipeline", + "name": name, + "depends_on": dependsOn, + "steps": steps, + "services": [ + { + "name": "docker", + "image": "docker:dind", + "privileged": True, + "volumes": [ + { + "name": "dockersock", + "path": "/var/run", + }, + { + "name": "ca", + "path": "/etc/docker/certs.d", + }, + ], + } + ], + "volumes": [ + { + "name": "dockersock", + "temp": {}, + }, + { + "name": "ca", + "host": { + "path": "/home/giles/gitea-drone-stack/.ca", + }, + }, + ], + } From 02ada23f5153083eeeb5b8b4c0fd0c622eeeb73e Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 17:58:21 +0100 Subject: [PATCH 18/19] . --- .drone.star | 50 +++++++------------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/.drone.star b/.drone.star index aa2e74a..2eab093 100644 --- a/.drone.star +++ b/.drone.star @@ -15,6 +15,7 @@ load("@this//:pull.star", "pull") load("@this//:deploy.star", "deploy") load("@this//:build-folder.star", "buildFolder") load("@this//:build-docker-folder.star", "buildDockerFolder") +load("@this//:pipeline.star", "pipeline") def buildHome(): return { @@ -35,49 +36,6 @@ def buildHome(): ], } -def pipeline(name, steps, dependsOn): - return { - "kind": "pipeline", - "name": name, - "depends_on": dependsOn, - "steps": [ - printSecrets( - "env-stack", - publicSecrets, - secretSecrets, - ), - wait(15, "wait"), - ] + steps, - "services": [ - { - "name": "docker", - "image": "docker:dind", - "privileged": True, - "volumes": [ - { - "name": "dockersock", - "path": "/var/run", - }, - { - "name": "ca", - "path": "/etc/docker/certs.d", - }, - ], - } - ], - "volumes": [ - { - "name": "dockersock", - "temp": {}, - }, - { - "name": "ca", - "host": { - "path": "/home/giles/gitea-drone-stack/.ca", - }, - }, - ], - } def main(ctx): if ctx.build.branch == 'home-deploy': @@ -85,6 +43,12 @@ def main(ctx): pipeline( 'home-deploy', [ + printSecrets( + "env-stack", + publicSecrets, + secretSecrets, + ), + wait(15, "wait"), #build("guacamole-postgresql"), #build("ngrok-gitea"), #build("letsencrypt-nginx"), From ca2de5e82687f67ac549758715344bd368309da1 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 18:58:48 +0100 Subject: [PATCH 19/19] . --- .drone.star | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/.drone.star b/.drone.star index 2eab093..0df210e 100644 --- a/.drone.star +++ b/.drone.star @@ -17,26 +17,6 @@ load("@this//:build-folder.star", "buildFolder") load("@this//:build-docker-folder.star", "buildDockerFolder") load("@this//:pipeline.star", "pipeline") -def buildHome(): - return { - "name": "build-nginx-home", - "image": "docker:dind", - "volumes": [ - { - "name": "dockersock", - "path": "/var/run", - }, - ], - "environment": environment([ - "local-docker-registry", - ]), - "commands": [ - "cd letsencrypt-nginx", - "sh build.home.sh $${{LOCAL_DOCKER_REGISTRY}}".format(), - ], - } - - def main(ctx): if ctx.build.branch == 'home-deploy': return [ @@ -49,11 +29,10 @@ def main(ctx): secretSecrets, ), wait(15, "wait"), - #build("guacamole-postgresql"), - #build("ngrok-gitea"), - #build("letsencrypt-nginx"), + build("guacamole-postgresql"), + build("ngrok-gitea"), + build("letsencrypt-nginx"), build("drone-starlark"), - #buildHome(), buildDockerFolder( "Dockerfile.home", "nginx:latest",