From a2c662ed6f437f879d1901b53f1707d1784ab1ba Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Tue, 28 Apr 2020 18:41:26 +0100
Subject: [PATCH] .

---
 .drone-do copy.star | 82 ++++++++++++++++++++++++++++++++++++++++++
 .drone-do.star      | 87 +++++----------------------------------------
 2 files changed, 90 insertions(+), 79 deletions(-)
 create mode 100644 .drone-do copy.star

diff --git a/.drone-do copy.star b/.drone-do copy.star
new file mode 100644
index 0000000..6d28a45
--- /dev/null
+++ b/.drone-do copy.star	
@@ -0,0 +1,82 @@
+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//stack:public-secrets.star", "publicSecrets")
+load("@this//stack: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("/root/stack-deploy"),
+          pull([
+            "letsencrypt-do",
+            "drone-starlark",
+            "guacamole-postgresql",
+          ]),
+          deploy(
+            "docker-compose-do.yml",
+            "gitea",
+            "/root/stack-deploy",
+            publicSecrets + secretSecrets,
+          ),
+        ],
+        [],
+        [
+          {
+            "name": "ca",
+            "host": {
+              "path": "/root/stack-deploy/.ca",
+            },
+          }
+        ],
+        [
+          {
+            "name": "ca",
+            "path": "/etc/docker/certs.d",
+          },
+        ]
+      ),
+    ]
+  else:
+    return pipeline(
+      ctx.build.branch,
+      [],
+      [],
+      [],
+      [],
+    )
\ No newline at end of file
diff --git a/.drone-do.star b/.drone-do.star
index 6d28a45..b65b5e5 100644
--- a/.drone-do.star
+++ b/.drone-do.star
@@ -1,82 +1,11 @@
-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//stack:public-secrets.star", "publicSecrets")
-load("@this//stack: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")
+load("@this//stack:drone.star", "drone")
 
 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("/root/stack-deploy"),
-          pull([
-            "letsencrypt-do",
-            "drone-starlark",
-            "guacamole-postgresql",
-          ]),
-          deploy(
-            "docker-compose-do.yml",
-            "gitea",
-            "/root/stack-deploy",
-            publicSecrets + secretSecrets,
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/root/stack-deploy/.ca",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
\ No newline at end of file
+  return drone(
+    ctx,
+    "do",
+    "/root/stack-deploy",
+    "gitea",
+  )
+  
\ No newline at end of file