From 9d066af7bb149183effa0e99faf32f27948dada3 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Wed, 29 Apr 2020 13:54:07 +0100
Subject: [PATCH] .

---
 .drone-do copy.star | 82 ---------------------------------------------
 .drone-do.star      | 11 ++++--
 2 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 .drone-do copy.star

diff --git a/.drone-do copy.star b/.drone-do copy.star
deleted file mode 100644
index 6d28a45..0000000
--- a/.drone-do copy.star	
+++ /dev/null
@@ -1,82 +0,0 @@
-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 bcac955..481f9c9 100644
--- a/.drone-do.star
+++ b/.drone-do.star
@@ -1,14 +1,19 @@
 
 load("@this//stack:drone.star", "drone")
+load("@this//stack:stack-name.star", "stackName")
+load("@this//stack:stack-root.star", "stackRoot")
+
 
 def main(ctx):
   return drone(
     ctx,
     "do",
-    "/root/stack-deploy",
-    "gitea",
+    stackRoot,
+    stackName,
     [
-      "docker service scale gitea_chat=1",
+      "docker service scale {name}_chat=1".format(name=stackName),
+      "docker service scale {name}_letsencrypt-drone=1".format(name=stackName),
+      "docker service scale {name}_letsencrypt-git=1".format(name=stackName),,
     ]
   )
   
\ No newline at end of file