From 66736218dc38f389c594a1eb3bcf50c0cd4e687f Mon Sep 17 00:00:00 2001
From: Aire-One <aireone@aireone.xyz>
Date: Fri, 9 Dec 2022 19:35:15 +0100
Subject: [PATCH 1/2] ci(docker-build): fix `repo` values

---
 .woodpecker/docker-build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.woodpecker/docker-build.yml b/.woodpecker/docker-build.yml
index f349ae2..da9f946 100644
--- a/.woodpecker/docker-build.yml
+++ b/.woodpecker/docker-build.yml
@@ -16,6 +16,7 @@ pipeline:
     settings:
       dockerfile: ${dockerfile_path}${DOCKERFILE}
       platforms: *platforms
+      repo: gitea.aireone.xyz/${CI_REPO,,}/${DOCKERFILE/Dockerfile./}
       dry_run: true
     when:
       event: pull_request
@@ -29,7 +30,7 @@ pipeline:
       dockerfile: ${dockerfile_path}${DOCKERFILE}
       platforms: *platforms
       registry: gitea.aireone.xyz
-      repo: gitea.aireone.xyz/${CI_REPO,,}/${DOCKERFILE}
+      repo: gitea.aireone.xyz/${CI_REPO,,}/${DOCKERFILE/Dockerfile./}
       tag: latest
       username:
         from_secret: publish_username
-- 
2.40.1


From a4e36cda9efc8c5787915aee9645f3b794e5ca09 Mon Sep 17 00:00:00 2001
From: Aire-One <aireone@aireone.xyz>
Date: Fri, 9 Dec 2022 19:50:19 +0100
Subject: [PATCH 2/2] ci(docker-build): fix Dockerfile path

---
 .woodpecker/docker-build.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.woodpecker/docker-build.yml b/.woodpecker/docker-build.yml
index da9f946..1d4b3ba 100644
--- a/.woodpecker/docker-build.yml
+++ b/.woodpecker/docker-build.yml
@@ -1,7 +1,6 @@
 variables:
   - &buildx woodpeckerci/plugin-docker-buildx:2.0.0
   - &platforms linux/amd64
-  - &dockerfile_path .woodpecker/docker/
   - &when_path .woodpecker/docker-build.yml
 
 matrix:
@@ -14,20 +13,19 @@ pipeline:
   dryrun:
     image: *buildx
     settings:
-      dockerfile: ${dockerfile_path}${DOCKERFILE}
+      dockerfile: .woodpecker/docker/${DOCKERFILE}
       platforms: *platforms
-      repo: gitea.aireone.xyz/${CI_REPO,,}/${DOCKERFILE/Dockerfile./}
       dry_run: true
     when:
       event: pull_request
       path:
         - *when_path
-        - ${dockerfile_path}${DOCKERFILE}
+        - .woodpecker/docker/${DOCKERFILE}
 
   publish:
     image: *buildx
     settings:
-      dockerfile: ${dockerfile_path}${DOCKERFILE}
+      dockerfile: .woodpecker/docker/${DOCKERFILE}
       platforms: *platforms
       registry: gitea.aireone.xyz
       repo: gitea.aireone.xyz/${CI_REPO,,}/${DOCKERFILE/Dockerfile./}
@@ -40,6 +38,6 @@ pipeline:
       event: push
       path:
         - *when_path
-        - ${dockerfile_path}${DOCKERFILE}
+        - .woodpecker/docker/${DOCKERFILE}
 
 branches: master
-- 
2.40.1