From 6a0325a0a1dea3de7fe6aa1c588e0ee0abc7d9dc Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Sat, 26 Aug 2023 11:30:01 +0100
Subject: [PATCH] chore: upgrade woodpecker to v1.0.2

- Upgrade woodpecker to v1.0.2
- Move the traefik configuration over to traefik
- The entrypoint script is no longer needed
---
 config                                               |  2 +-
 templates/traefik/Dockerfile.gotmpl                  |  2 ++
 .../dynamic_woodpecker.yaml.gotmpl}                  |  0
 templates/woodpecker/Dockerfile.gotmpl               |  4 +---
 templates/woodpecker/entrypoint.sh.gotmpl            | 12 ------------
 5 files changed, 4 insertions(+), 16 deletions(-)
 rename templates/{woodpecker/traefik_woodpecker.yaml.gotmpl => traefik/dynamic_woodpecker.yaml.gotmpl} (100%)
 delete mode 100644 templates/woodpecker/entrypoint.sh.gotmpl

diff --git a/config b/config
index b18f012..a360553 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit b18f01222f5291c28835eecfda6acd99a12ab3d9
+Subproject commit a36055337246e8ddd83811c982769fab1d555748
diff --git a/templates/traefik/Dockerfile.gotmpl b/templates/traefik/Dockerfile.gotmpl
index 101c167..4f1aaf0 100644
--- a/templates/traefik/Dockerfile.gotmpl
+++ b/templates/traefik/Dockerfile.gotmpl
@@ -7,6 +7,8 @@ ADD dynamic_landing_page.yaml /tmp/dynamic_landing_page.yaml
 
 ADD dynamic_gotosocial.yaml /tmp/dynamic_gotosocial.yaml
 
+ADD dynamic_woodpecker.yaml /tmp/dynamic_woodpecker.yaml
+
 ADD entrypoint.sh /
 
 RUN chmod +x /entrypoint.sh
diff --git a/templates/woodpecker/traefik_woodpecker.yaml.gotmpl b/templates/traefik/dynamic_woodpecker.yaml.gotmpl
similarity index 100%
rename from templates/woodpecker/traefik_woodpecker.yaml.gotmpl
rename to templates/traefik/dynamic_woodpecker.yaml.gotmpl
diff --git a/templates/woodpecker/Dockerfile.gotmpl b/templates/woodpecker/Dockerfile.gotmpl
index a260d07..05b98e0 100644
--- a/templates/woodpecker/Dockerfile.gotmpl
+++ b/templates/woodpecker/Dockerfile.gotmpl
@@ -16,8 +16,6 @@ RUN --mount=type=bind,source=.,target=/packages \
     && mv /tmp/woodpecker-server /usr/local/bin/woodpecker-server \
     && cp /packages/entrypoint.sh /usr/local/bin/entrypoint \
     && chmod a+x /usr/local/bin/entrypoint \
-    && cp /packages/traefik_woodpecker.yaml /flow/woodpecker/tmp/traefik_woodpecker.yaml \
-    && chown {{ .Woodpecker.LinuxUID }}:{{ .FlowGID }} /flow/woodpecker/tmp/traefik_woodpecker.yaml \
     && rm -rf /tmp/*
 
 ENV GODEBUG=netdns=go
@@ -26,4 +24,4 @@ USER {{ .Woodpecker.LinuxUID }}:{{ .FlowGID }}
 
 WORKDIR /
 
-ENTRYPOINT ["entrypoint"]
+ENTRYPOINT ["woodpecker-server"]
diff --git a/templates/woodpecker/entrypoint.sh.gotmpl b/templates/woodpecker/entrypoint.sh.gotmpl
deleted file mode 100644
index d157e00..0000000
--- a/templates/woodpecker/entrypoint.sh.gotmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# Move the dynamic traefik config to the shared volume
-if [ -f /flow/woodpecker/tmp/traefik_woodpecker.yaml ]; then
-    mv /flow/woodpecker/tmp/traefik_woodpecker.yaml {{ .Traefik.SharedMountPoint }}/dynamic/traefik_woodpecker.yaml
-fi
-
-exec woodpecker-server