From a6d0bf7fafb79d4d62d9963c420399740d993cc1 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Sun, 10 May 2020 16:39:26 +0100
Subject: [PATCH] .

---
 docker-compose.yml                    |  6 -----
 drone-starlark/repos/deploy.star      |  3 ---
 drone-starlark/repos/stack/drone.star | 33 ---------------------------
 3 files changed, 42 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c3054b4..8e56435 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -434,7 +434,6 @@ volumes:
   drone:
   drone-data:
   registry-data:
-  registry-cache-data:
   guacamole-postgresql-data:
   commento-postgresql-data:
   ghost-content:
@@ -458,8 +457,3 @@ networks:
   externalnet:
     driver: overlay
     external: true
-secrets:
-  'registry-cert':
-    file: .certificates/registry.crt
-  'registry-key':
-    file: .certificates/registry.key
diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star
index cad282b..0f9dda1 100644
--- a/drone-starlark/repos/deploy.star
+++ b/drone-starlark/repos/deploy.star
@@ -30,9 +30,6 @@ def deploy(
         "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit),
         "docker network prune -f",
         "cd {folder}".format(folder=folder),
-        "docker stack rm proxy",
-        "sleep 30",
-        "docker stack deploy -c docker-compose-proxy.yml proxy",
         "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/stack/drone.star b/drone-starlark/repos/stack/drone.star
index 796c5e7..5a23225 100644
--- a/drone-starlark/repos/stack/drone.star
+++ b/drone-starlark/repos/stack/drone.star
@@ -39,23 +39,7 @@ def drone(
           ),
           build("gitea"),
           build("guacamole-postgresql"),
-          build("ngrok-gitea"),
-          build("letsencrypt-nginx"),
           build("ghost"),
-          buildDockerFolder(
-            "Dockerfile.git",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-git",
-            "letsencrypt-nginx",
-            "git",
-          ),
-          buildDockerFolder(
-            "Dockerfile.drone",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone",
-            "letsencrypt-nginx",
-            "drone",
-          ),
           scp(base),
           pull(
             "pull images",
@@ -63,26 +47,9 @@ def drone(
               "drone-starlark",
               "gitea",
               "ghost",
-              "ngrok-gitea",
-              "letsencrypt-git",
-              "letsencrypt-drone",
               "guacamole-postgresql",
             ],
           ),
-          #pull(
-          #  "pull registry",
-          #  [
-          #    "letsencrypt-registry",
-          #  ],
-          #),
-          #deploy(
-          #  "docker-compose-registry.yml",
-          #  'registry',
-          #  base,
-          #  publicSecrets + secretSecrets,
-          #  commands,
-          #  ctx
-          #),
           deploy(
             "docker-compose.yml",
             name,