From c640b2fb7d7d76dc488c994b3ccbf9fbe3141538 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias@schmidl.dev>
Date: Wed, 13 Sep 2023 17:35:00 +0200
Subject: [PATCH 01/12] fix: try to fix the pipeline

---
 .woodpecker.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7c40070..9968da8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
+---
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
@@ -10,6 +11,7 @@ steps:
       registry: git.schmidl.dev
       dry_run: true
       output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
+
   publish-next-agent:
     image: woodpeckerci/plugin-docker-buildx
     secrets: [docker_username, docker_password]
@@ -20,3 +22,4 @@ steps:
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
+...

From 9c0094ed710f4d602249aa51d199778592f3f068 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 15:55:38 +0200
Subject: [PATCH 02/12] .woodpecker.yml aktualisiert

---
 .woodpecker.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9968da8..2688a29 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -6,6 +6,7 @@
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
+    group: build
     settings:
       repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
       registry: git.schmidl.dev
@@ -14,6 +15,7 @@ steps:
 
   publish-next-agent:
     image: woodpeckerci/plugin-docker-buildx
+    group: publish
     secrets: [docker_username, docker_password]
     settings:
       repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage

From 82dc1321900a1e60a553ed09fc73d57b4c62ed1f Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 15:57:13 +0200
Subject: [PATCH 03/12] .woodpecker.yml aktualisiert

---
 .woodpecker.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2688a29..917c38a 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,8 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Tobias Schmidl
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
 
----
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
@@ -24,4 +20,3 @@ steps:
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
-...

From ab610c3834b0c89c86f4b1c412439d00fe496dab Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 15:58:51 +0200
Subject: [PATCH 04/12] .woodpecker.yml aktualisiert

---
 .woodpecker.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 917c38a..73ce9bc 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,22 +1,26 @@
-
+# SPDX-FileCopyrightText: 2023 Tobias Schmidl
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+---
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
     group: build
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: git.schmidl.dev/$${CI-REPO_OWNER}/buildimage
       registry: git.schmidl.dev
       dry_run: true
-      output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
+      output: type=oci,dest=$${CI_REPO_OWNER}-buildimage.tar
 
   publish-next-agent:
     image: woodpeckerci/plugin-docker-buildx
     group: publish
     secrets: [docker_username, docker_password]
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: git.schmidl.dev/$${CI-REPO_OWNER}/buildimage
       dockerfile: dockerfile
       platforms: linux/amd64,linux/arm64/v8
     when:
-      branch: ${CI_REPO_DEFAULT_BRANCH}
+      branch: $${CI_REPO_DEFAULT_BRANCH}
       event: push
+...

From 3aea973103ed72978b3273b91adbb3ab50c540e8 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 16:11:06 +0200
Subject: [PATCH 05/12] .woodpecker.yml aktualisiert

---
 .woodpecker.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 73ce9bc..00223a4 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,20 +7,20 @@ steps:
     image: woodpeckerci/plugin-docker-buildx
     group: build
     settings:
-      repo: git.schmidl.dev/$${CI-REPO_OWNER}/buildimage
+      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
       registry: git.schmidl.dev
       dry_run: true
-      output: type=oci,dest=$${CI_REPO_OWNER}-buildimage.tar
+#      output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
 
   publish-next-agent:
     image: woodpeckerci/plugin-docker-buildx
     group: publish
     secrets: [docker_username, docker_password]
     settings:
-      repo: git.schmidl.dev/$${CI-REPO_OWNER}/buildimage
+      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
       dockerfile: dockerfile
       platforms: linux/amd64,linux/arm64/v8
     when:
-      branch: $${CI_REPO_DEFAULT_BRANCH}
+      branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
 ...

From 5f40113351c5a393f35be8b877af8aebf8309499 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 16:15:41 +0200
Subject: [PATCH 06/12] .woodpecker.yml aktualisiert

---
 .woodpecker.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 00223a4..e1a87be 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -2,12 +2,14 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 ---
+variables:
+  - &repo git.schmidl.dev/${CI-REPO_OWNER}/buildimage
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
     group: build
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: *repo
       registry: git.schmidl.dev
       dry_run: true
 #      output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
@@ -17,10 +19,10 @@ steps:
     group: publish
     secrets: [docker_username, docker_password]
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: *repo
       dockerfile: dockerfile
       platforms: linux/amd64,linux/arm64/v8
     when:
-      branch: ${CI_REPO_DEFAULT_BRANCH}
+      branch: master
       event: push
 ...

From b9a697c03db8f8af3dfba812752d163f53afb70a Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 16:28:39 +0200
Subject: [PATCH 07/12] .woodpecker.yml aktualisiert

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

diff --git a/.woodpecker.yml b/.woodpecker.yml
index e1a87be..51ebc9c 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 ---
 variables:
-  - &repo git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+  - &repo git.schmidl.dev/$${CI-REPO_OWNER}/buildimage
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
@@ -20,6 +20,7 @@ steps:
     secrets: [docker_username, docker_password]
     settings:
       repo: *repo
+      registry: git.schmidl.dev
       dockerfile: dockerfile
       platforms: linux/amd64,linux/arm64/v8
     when:

From cff2fb783f322532e2ed9f9c5fecb7038f890eb6 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 22:36:16 +0200
Subject: [PATCH 08/12] .woodpecker.yml aktualisiert

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 51ebc9c..f265d8e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 ---
 variables:
-  - &repo git.schmidl.dev/$${CI-REPO_OWNER}/buildimage
+  - &repo 'git.schmidl.dev/${CI-REPO_OWNER}/buildimage'
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx

From 808c42df23a32c71fe4180a91ee613ed64795805 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 22:37:30 +0200
Subject: [PATCH 09/12] .woodpecker.yml aktualisiert

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index f265d8e..1e1fe20 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 ---
 variables:
-  - &repo 'git.schmidl.dev/${CI-REPO_OWNER}/buildimage'
+  - &repo 'git.schmidl.dev/schtobia/buildimage'
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx

From af0c32c7bab7b8faec0baae8fb05fc10a5bd7839 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <schtobia@noreply.localhost>
Date: Thu, 21 Sep 2023 22:44:06 +0200
Subject: [PATCH 10/12] fix: Repaired woodpecker pipeline

Reviewed-on: https://git.schmidl.dev/schtobia/buildimage/pulls/1
---
 .woodpecker.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7c40070..1e1fe20 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,22 +1,29 @@
 # SPDX-FileCopyrightText: 2023 Tobias Schmidl
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
-
+---
+variables:
+  - &repo 'git.schmidl.dev/schtobia/buildimage'
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
+    group: build
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: *repo
       registry: git.schmidl.dev
       dry_run: true
-      output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
+#      output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
+
   publish-next-agent:
     image: woodpeckerci/plugin-docker-buildx
+    group: publish
     secrets: [docker_username, docker_password]
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: *repo
+      registry: git.schmidl.dev
       dockerfile: dockerfile
       platforms: linux/amd64,linux/arm64/v8
     when:
-      branch: ${CI_REPO_DEFAULT_BRANCH}
+      branch: master
       event: push
+...

From 84d4b50404b965773f028f93e25b73d49563760c Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias@schmidl.dev>
Date: Fri, 22 Sep 2023 08:17:49 +0200
Subject: [PATCH 11/12] feat: don't require build-args for the labels, just
 write the directly via --label

---
 Makefile   |  3 ++-
 dockerfile | 13 ++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 630f7c9..fdb7fb8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,11 @@
 DOCKER := docker
 BUILDER := ${DOCKER} buildx
 TAG := git.schmidl.dev/schtobia/buildimage
+URL:= https://${TAG}
 VERSION = $(shell git describe --tags --always --dirty)
 
 build: dockerfile
-	@${BUILDER} build --build-arg=GIT_COMMIT=$(shell git describe --always) --build-arg=VERSION=${VERSION} --build-arg=TIMESTAMP="$(shell date -u -Iseconds)" -t ${TAG} -t ${TAG}:${VERSION} .
+	@${BUILDER} build --label org.opencontainers.image.revision=$(shell git describe --always) --label org.opencontainers.image.version=${VERSION} --label org.opencontainers.image.created="$(shell date -u -Iseconds)" --label org.opencontainers.image.source=https://${TAG}.git  --label org.opencontainers.image.url=https://${TAG} -t ${TAG} -t ${TAG}:${VERSION} .
 
 .PHONY: publish
 publish: build
diff --git a/dockerfile b/dockerfile
index 48ec00a..4878406 100644
--- a/dockerfile
+++ b/dockerfile
@@ -5,19 +5,14 @@
 FROM debian:bullseye-slim
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG GIT_COMMIT
-ARG VERSION
-ARG TIMESTAMP
 LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later" \
 org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \
-org.opencontainers.image.title=buildimage \
-org.opencontainers.image.source="https://git.schmidl.dev/schtobia/buildimage" \
-org.opencontainers.image.url="https://git.schmidl.dev/schtobia/buildimage"
+org.opencontainers.image.title=buildimage
 
 # editorconfig-checker-disable
 
 RUN apt update \
- && apt install --assume-yes --no-install-recommends \
+ && apt install --assume-yes --no-install-recommends --quiet \
         build-essential \
         dpkg-sig \
         git \
@@ -30,7 +25,3 @@ RUN useradd -rm builder
 USER builder
 
 WORKDIR /workdir
-
-LABEL org.opencontainers.image.revision=${GIT_COMMIT}
-LABEL org.opencontainers.image.version=${VERSION}
-LABEL org.opencontainers.image.created=${TIMESTAMP}

From fc80df1ce7cb5fdd3a0d3f5750ab44b8836317a0 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias@schmidl.dev>
Date: Fri, 22 Sep 2023 08:18:22 +0200
Subject: [PATCH 12/12] fix: pass docker_username, docker_password to publish
 stage

---
 .woodpecker.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 1e1fe20..a9b87b4 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2023 Tobias Schmidl
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
+
 ---
 variables:
   - &repo 'git.schmidl.dev/schtobia/buildimage'
@@ -12,7 +13,10 @@ steps:
       repo: *repo
       registry: git.schmidl.dev
       dry_run: true
-#      output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
+    when:
+      branch:
+        exclude: [ master ]
+      event: push
 
   publish-next-agent:
     image: woodpeckerci/plugin-docker-buildx
@@ -23,7 +27,11 @@ steps:
       registry: git.schmidl.dev
       dockerfile: dockerfile
       platforms: linux/amd64,linux/arm64/v8
-    when:
-      branch: master
-      event: push
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+    #when:
+    #  branch: master
+    #  event: push
 ...