From 26b92eeb2f26f8abce111f798c61cb1dd586eb84 Mon Sep 17 00:00:00 2001
From: samuel-p <codes@samuel-philipp.de>
Date: Sun, 28 Nov 2021 02:45:05 +0100
Subject: [PATCH] updated to use master branch

---
 .woodpecker.yml |  2 --
 Dockerfile      |  7 ++++---
 renovate.json   | 13 +++++--------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 25b377c..2736869 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -6,7 +6,6 @@ pipeline:
       - DOCKER_PASSWORD
     repo: spcodes/activity-relay
     tags:
-      - 0.1.0
       - latest
     when:
       branch:
@@ -23,7 +22,6 @@ pipeline:
     registry: cr.sp-codes.de
     repo: cr.sp-codes.de/activity-relay
     tags:
-      - 0.1.0
       - latest
     when:
       branch:
diff --git a/Dockerfile b/Dockerfile
index 93d498d..cf63f51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,11 +2,12 @@ FROM python:3.10.0-alpine@sha256:1aac9b1e6201c1a224742e2f9ab0ca37689e6c9754b9438
 
 WORKDIR /workdir/
 
-ENV RELAY_VERSION="0.1.0"
+ENV RELAY_VERSION="5c5f212d709aa44280f487aae01cf45a458f0762"
 
 RUN apk upgrade --no-cache \
- && apk add --no-cache alpine-sdk autoconf automake libtool gcc curl tar \
- && curl -L "https://git.pleroma.social/pleroma/relay/-/archive/${RELAY_VERSION}/relay-${RELAY_VERSION}.tar.gz" | tar xvz --strip 1 \
+ && apk add --no-cache alpine-sdk autoconf automake libtool gcc git \
+ && git clone https://git.pleroma.social/pleroma/relay.git . \
+ && git checkout "${RELAY_VERSION}" \
  && pip3 install .
 
 CMD ["python", "-m", "relay"]
diff --git a/renovate.json b/renovate.json
index 4880668..9672ce6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -10,17 +10,14 @@
   "regexManagers": [
     {
       "fileMatch": [
-        "^Dockerfile$",
-        "^.woodpecker.yml$"
+        "^Dockerfile$"
       ],
       "matchStrings": [
-        "\\s+ENV\\s*RELAY_VERSION=\"(?<currentValue>.*?)\"\\s+",
-        "\\s+repo:\\s*\\S*\\/activity-relay\\s+tags:[-\\s]+(?<currentValue>.*?)\\s+"
+        "\\s+ENV\\s*RELAY_VERSION=\"(?<currentValue>.*?)\"\\s+"
       ],
-      "versioningTemplate": "loose",
-      "registryUrl": "https://git.pleroma.social",
-      "depNameTemplate": "pleroma/relay",
-      "datasourceTemplate": "gitlab-releases"
+      "depNameTemplate": "https://git.pleroma.social/pleroma/relay.git",
+      "versioningTemplate": "git",
+      "datasourceTemplate": "git-refs"
     }
   ],
   "packageRules": [