From 86caa6e7a180e15a50edb2050e2d02c0b92bea9a Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Mon, 27 Apr 2020 23:48:48 +0100
Subject: [PATCH] .

---
 .../repos/build-docker-folder-temp.star       | 31 ----------------
 drone-starlark/repos/deploy-2.star            | 35 -------------------
 drone-starlark/repos/deploy.star              |  5 +--
 3 files changed, 3 insertions(+), 68 deletions(-)
 delete mode 100644 drone-starlark/repos/build-docker-folder-temp.star
 delete mode 100644 drone-starlark/repos/deploy-2.star

diff --git a/drone-starlark/repos/build-docker-folder-temp.star b/drone-starlark/repos/build-docker-folder-temp.star
deleted file mode 100644
index 90d5f98..0000000
--- a/drone-starlark/repos/build-docker-folder-temp.star
+++ /dev/null
@@ -1,31 +0,0 @@
-load("@this//:environment.star", "environment")
-def buildDockerFolder(
-  dockerFile,
-  image,
-  tag,
-  folder,
-  name,
-):
-  return {
-    "name": "build-{name}".format(
-      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} {image} {tag}".format(
-        image = image,
-        dockerFile = dockerFile,
-        tag = tag,
-      ),
-    ],
-  }
diff --git a/drone-starlark/repos/deploy-2.star b/drone-starlark/repos/deploy-2.star
deleted file mode 100644
index 3286f54..0000000
--- a/drone-starlark/repos/deploy-2.star
+++ /dev/null
@@ -1,35 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:export.star", "export")
-load("@this//:public-secrets.star", "publicSecrets")
-load("@this//:secret-secrets.star", "secretSecrets")
-
-def deploy(
-  filename,
-  name,
-  folder,
-):
-  return {
-    "name": "deploy",
-    "image": "appleboy/drone-ssh",
-    "environment": environment(publicSecrets + secretSecrets),
-    "settings": {
-      "envs": [x.replace("-", "_") for x in publicSecrets + secretSecrets ],
-      "host": fromSecret("ssh-host"),
-      "port": fromSecret("ssh-port"),
-      "username": fromSecret("ssh-root-user"),
-      "password": fromSecret("ssh-root-password"),
-      "script": [
-        "set -e"
-      ] +
-      map(export, publicSecrets + secretSecrets) + 
-      [
-        "docker network prune -f",
-        "cd {folder}".format(folder=folder),
-        "docker stack rm {name}".format(name = name),
-        "sleep 30",
-        "docker stack deploy -c {filename} {name}".format(name= name, filename = filename),
-      ]
-    }
-  }
diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star
index f2a2a64..3286f54 100644
--- a/drone-starlark/repos/deploy.star
+++ b/drone-starlark/repos/deploy.star
@@ -7,6 +7,7 @@ load("@this//:secret-secrets.star", "secretSecrets")
 
 def deploy(
   filename,
+  name,
   folder,
 ):
   return {
@@ -26,9 +27,9 @@ def deploy(
       [
         "docker network prune -f",
         "cd {folder}".format(folder=folder),
-        "docker stack rm gitea",
+        "docker stack rm {name}".format(name = name),
         "sleep 30",
-        "docker stack deploy -c {filename} gitea".format(filename = filename),
+        "docker stack deploy -c {filename} {name}".format(name= name, filename = filename),
       ]
     }
   }