Giles Bradshaw 6 months ago
parent
commit
98aae8c614
5 changed files with 12 additions and 7 deletions
  1. +2
    -3
      docker-compose-home.yml
  2. +4
    -1
      drone-starlark/Dockerfile
  3. +3
    -1
      drone-starlark/repos/stack/public-secrets.star
  4. +2
    -2
      drone-starlark/run.sh
  5. +1
    -0
      ngrok-gitea/Dockerfile

+ 2
- 3
docker-compose-home.yml View File

@@ -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:


+ 4
- 1
drone-starlark/Dockerfile View File

@@ -1,4 +1,7 @@
FROM drone/drone-convert-starlark
COPY repos /repos
COPY run.sh /
CMD sh run.sh
USER root
RUN apk update
RUN apk add gettext # enables envsubst
CMD sh /run.sh

+ 3
- 1
drone-starlark/repos/stack/public-secrets.star View File

@@ -11,5 +11,7 @@ publicSecrets = [
"remote-domain",
"ssh-user",
"guacamole-postgres-db",
"guacamole-postgres-user"
"guacamole-postgres-user",
"sigyl-stack-root",
"sigyl-stack-name",
]

+ 2
- 2
drone-starlark/run.sh View File

@@ -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

+ 1
- 0
ngrok-gitea/Dockerfile View File

@@ -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