From 079b1611eeb2d9a305209aa1758fa535b99a0ac3 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Mon, 27 Apr 2020 20:55:45 +0100
Subject: [PATCH] .

---
 .drone-do.star | 61 +++++++++++++++++++++++++++++++++++++++
 .drone.star    | 77 +-------------------------------------------------
 2 files changed, 62 insertions(+), 76 deletions(-)
 create mode 100644 .drone-do.star

diff --git a/.drone-do.star b/.drone-do.star
new file mode 100644
index 0000000..9c0dd27
--- /dev/null
+++ b/.drone-do.star
@@ -0,0 +1,61 @@
+load("@this//:from-secret.star", "fromSecret")
+load("@this//:print-secrets.star", "printSecrets")
+
+load("@this//:map.star", "map")
+load("@this//:environment.star", "environment")
+load("@this//:echo.star", "echo")
+load("@this//:export.star", "export")
+load("@this//:echo-secret.star", "echoSecret")
+load("@this//:wait.star", "wait")
+load("@this//:build.star", "build")
+load("@this//:scp.star", "scp")
+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")
+load("@this//:build-docker-folder.star", "buildDockerFolder")
+load("@this//:pipeline.star", "pipeline")
+load("@this//:clear.star", "clear")
+
+def main(ctx):
+  if ctx.build.branch == 'do':
+    return [
+      pipeline(
+        'do',
+        [
+          printSecrets(
+            "env-stack",
+            publicSecrets,
+            secretSecrets,
+          ),
+          clear("/home/giles/stack-deploy"),
+          wait(15, "wait"),
+          build("guacamole-postgresql"),
+          build("letsencrypt-nginx"),
+          build("drone-starlark"),
+          
+          buildDockerFolder(
+            "Dockerfile.do",
+            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
+            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-do",
+            "letsencrypt-nginx",
+            "do",
+          ),
+          scp("/home/giles/stack-deploy"),
+          pull([
+            "letsencrypt-do",
+            "drone-starlark",
+            "guacamole-postgresql",
+          ]),
+          deploy(
+            "docker-compose-do.yml",
+            "/home/giles/gitea-drone-stack",
+          ),
+        ],
+        [],
+        [],
+        [],
+      ),
+    ]
+  
\ No newline at end of file
diff --git a/.drone.star b/.drone.star
index 022f315..4bb8f04 100644
--- a/.drone.star
+++ b/.drone.star
@@ -85,6 +85,7 @@ def main(ctx):
             "letsencrypt-blog",
             "home",
             "drone-starlark",
+            "guacamole-postgresql",
           ]),
           deploy(
             "docker-compose-home.yml",
@@ -108,80 +109,4 @@ def main(ctx):
         ]
       ),
     ]
-  if ctx.build.branch == 'do':
-    return [
-      pipeline(
-        'do',
-        [
-          printSecrets(
-            "env-stack",
-            publicSecrets,
-            secretSecrets,
-          ),
-          wait(15, "wait"),
-          build("guacamole-postgresql"),
-          build("ngrok-gitea"),
-          build("letsencrypt-nginx"),
-          build("drone-starlark"),
-          buildDockerFolder(
-            "Dockerfile.home",
-            "nginx:latest",
-            "$${LOCAL_DOCKER_REGISTRY}home",
-            "letsencrypt-nginx",
-            "home",
-          ),
-          
-          buildDockerFolder(
-            "Dockerfile.blog",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-blog",
-            "letsencrypt-nginx",
-            "blog",
-          ),
-          buildDockerFolder(
-            "Dockerfile.drone",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone",
-            "letsencrypt-nginx",
-            "drone",
-          ),
-          buildDockerFolder(
-            "Dockerfile.git",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-git",
-            "letsencrypt-nginx",
-            "git",
-          ),
-          buildDockerFolder(
-            "Dockerfile.remote",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-remote",
-            "letsencrypt-nginx",
-            "remote",
-          ),
-          buildDockerFolder(
-            "Dockerfile.chat",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-chat",
-            "letsencrypt-nginx",
-            "chat",
-          ),
-          scp("~/gitea-drone-stack"),
-          pull([
-            "letsencrypt-git",
-            "letsencrypt-chat",
-            "letsencrypt-drone",
-            "letsencrypt-remote",
-            "letsencrypt-blog",
-            "home",
-            "drone-starlark",
-          ]),
-          deploy(
-            "docker-compose-home.yml",
-            "/home/giles/gitea-drone-stack",
-          ),
-        ],
-        [],
-      ),
-    ]
   
\ No newline at end of file