From aa39cedd8ba5c2d29beac4df7c916f9eb1ef78e3 Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Sat, 26 Aug 2023 11:14:10 +0100
Subject: [PATCH] chore(traefik): move GTS traefik config to traefik

---
 templates/gotosocial/entrypoint.sh.gotmpl                    | 5 -----
 templates/traefik/Dockerfile.gotmpl                          | 3 +++
 .../dynamic_gotosocial.yaml.gotmpl}                          | 0
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename templates/{gotosocial/traefik_gotosocial.yaml.gotmpl => traefik/dynamic_gotosocial.yaml.gotmpl} (100%)

diff --git a/templates/gotosocial/entrypoint.sh.gotmpl b/templates/gotosocial/entrypoint.sh.gotmpl
index 44e66f8..fdf86ea 100644
--- a/templates/gotosocial/entrypoint.sh.gotmpl
+++ b/templates/gotosocial/entrypoint.sh.gotmpl
@@ -4,11 +4,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# Move the dynamic traefik config to the shared volume
-if [ -f /flow/gts/tmp/traefik_gotosocial.yaml ]; then
-    mv /flow/gts/tmp/traefik_gotosocial.yaml {{ .Traefik.SharedMountPoint }}/dynamic/traefik_gotosocial.yaml
-fi
-
 mkdir -p {{ .GoToSocial.DataContainerDirectory }}/database
 
 exec gotosocial --config-path /flow/gts/config/config.yaml server start
diff --git a/templates/traefik/Dockerfile.gotmpl b/templates/traefik/Dockerfile.gotmpl
index 7a9a249..101c167 100644
--- a/templates/traefik/Dockerfile.gotmpl
+++ b/templates/traefik/Dockerfile.gotmpl
@@ -1,9 +1,12 @@
+# syntax=docker/dockerfile:1
 FROM traefik:{{ .Traefik.Version }}
 
 ADD traefik.yaml /flow/traefik/
 
 ADD dynamic_landing_page.yaml /tmp/dynamic_landing_page.yaml
 
+ADD dynamic_gotosocial.yaml /tmp/dynamic_gotosocial.yaml
+
 ADD entrypoint.sh /
 
 RUN chmod +x /entrypoint.sh
diff --git a/templates/gotosocial/traefik_gotosocial.yaml.gotmpl b/templates/traefik/dynamic_gotosocial.yaml.gotmpl
similarity index 100%
rename from templates/gotosocial/traefik_gotosocial.yaml.gotmpl
rename to templates/traefik/dynamic_gotosocial.yaml.gotmpl