From 98aae8c61443e70c686c826627ff0ec3ae854a4e Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Wed, 29 Apr 2020 12:38:54 +0100
Subject: [PATCH] .

---
 docker-compose-home.yml                        | 5 ++---
 drone-starlark/Dockerfile                      | 5 ++++-
 drone-starlark/repos/stack/public-secrets.star | 4 +++-
 drone-starlark/run.sh                          | 4 ++--
 ngrok-gitea/Dockerfile                         | 1 +
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docker-compose-home.yml b/docker-compose-home.yml
index 49d03bb..7698b18 100644
--- a/docker-compose-home.yml
+++ b/docker-compose-home.yml
@@ -151,6 +151,8 @@ services:
       - DRONE_DEBUG=true
       - DRONE_SECRET=${DRONE_CONVERT_SECRET}
       - DRONE_STARLARK_REPO_PATHS=this:/repos
+      - SIGYL_STACK_NAME=$SIGYL_STACK_NAME
+      - SIGYL_STACK_ROOT=$SIGYL_STACK_ROOT
     networks:
       - appnet
 
@@ -314,11 +316,8 @@ volumes:
   registry-data:
   registry-cache-data:
   guacamole-postgresql-data:
-  letsencrypt-remote:
-  letsencrypt-chat:
   letsencrypt-git:
   letsencrypt-drone:
-  letsencrypt-blog:
   ghost-content:
   mongo-chat:
   chat-uploads:
diff --git a/drone-starlark/Dockerfile b/drone-starlark/Dockerfile
index 45537c3..478ba1b 100644
--- a/drone-starlark/Dockerfile
+++ b/drone-starlark/Dockerfile
@@ -1,4 +1,7 @@
 FROM drone/drone-convert-starlark
 COPY repos /repos
 COPY run.sh /
-CMD sh run.sh
\ No newline at end of file
+USER root
+RUN apk update
+RUN apk add gettext # enables envsubst
+CMD sh /run.sh
\ No newline at end of file
diff --git a/drone-starlark/repos/stack/public-secrets.star b/drone-starlark/repos/stack/public-secrets.star
index e51a225..7097d6c 100644
--- a/drone-starlark/repos/stack/public-secrets.star
+++ b/drone-starlark/repos/stack/public-secrets.star
@@ -11,5 +11,7 @@ publicSecrets = [
   "remote-domain",
   "ssh-user",
   "guacamole-postgres-db",
-  "guacamole-postgres-user"
+  "guacamole-postgres-user",
+  "sigyl-stack-root",
+  "sigyl-stack-name",
 ]
\ No newline at end of file
diff --git a/drone-starlark/run.sh b/drone-starlark/run.sh
index 579f2c4..f9a8956 100644
--- a/drone-starlark/run.sh
+++ b/drone-starlark/run.sh
@@ -1,3 +1,3 @@
-envsubst < /repos/stack/stack-name._star > /repos/stack/stack-name._star
-envsubst < /repos/stack/stack-root._star > /repos/stack/stack-root._star
+envsubst < /repos/stack/stack-name._star > /repos/stack/stack-name.star
+envsubst < /repos/stack/stack-root._star > /repos/stack/stack-root.star
 /bin/drone-convert-starlark
\ No newline at end of file
diff --git a/ngrok-gitea/Dockerfile b/ngrok-gitea/Dockerfile
index b7897a1..c042d52 100644
--- a/ngrok-gitea/Dockerfile
+++ b/ngrok-gitea/Dockerfile
@@ -2,5 +2,6 @@ FROM wernight/ngrok
 COPY run.sh /
 COPY ngrok._yml /home/ngrok/.ngrok2/ngrok._yml
 USER root
+RUN apk update
 RUN apk add gettext # enables envsubst
 CMD sh /run.sh
\ No newline at end of file