From ee271c4dfe268f1aac6c5262b9f67da2e3d54f2a Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Thu, 30 Apr 2020 21:22:10 +0100
Subject: [PATCH] .

---
 drone-starlark/repos/echo.star        |  2 +-
 drone-starlark/repos/stack/drone.star | 11 ++---------
 gitea/run.sh                          |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drone-starlark/repos/echo.star b/drone-starlark/repos/echo.star
index 7f39e5b..a8b8e68 100644
--- a/drone-starlark/repos/echo.star
+++ b/drone-starlark/repos/echo.star
@@ -1,7 +1,7 @@
 load("@this//:secret-to-environment.star", "secretToEnvironment")
 
 def echo(secret):
-  return 'echo "eeexport {environment}=${environment}" >> ***filename*** # {secret}'.format(
+  return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format(
       secret = secret,
       environment = secretToEnvironment(secret),
     )
diff --git a/drone-starlark/repos/stack/drone.star b/drone-starlark/repos/stack/drone.star
index 297e5fd..de045cb 100644
--- a/drone-starlark/repos/stack/drone.star
+++ b/drone-starlark/repos/stack/drone.star
@@ -32,15 +32,6 @@ def drone(
         [
           wait(15, "wait"),
           build("drone-starlark"),
-          pull(
-            "pull drone",
-            [
-            "drone-starlark",
-          ]),
-          rescale(
-            "{name}_drone-starlark".format(name=name),
-            1,
-          ),
           printSecrets(
             "env-stack",
             publicSecrets,
@@ -69,6 +60,8 @@ def drone(
           pull(
             "pull images",
             [
+              "drone-starlark",
+              "gitea",
               "ghost",
               "ngrok-gitea",
               "letsencrypt-git",
diff --git a/gitea/run.sh b/gitea/run.sh
index 75c8d30..9f148ea 100644
--- a/gitea/run.sh
+++ b/gitea/run.sh
@@ -2,7 +2,7 @@ envsubst < /init/app.ini > /data/gitea/conf/app.ini
 
 for file in /init/templates
 do
-  envsubst < "/init/templates/$file" > "/data/gitea/templates/$file"
+  envsubst < "$file" > "/data/gitea/templates/$(basename '$file')"
 done
 
 /bin/s6-svscan /etc/s6