From 611c16a0877654f3d61452379ebcec38716a7584 Mon Sep 17 00:00:00 2001
From: Job79 <job@plabble.org>
Date: Mon, 20 Oct 2025 20:33:09 +0200
Subject: [PATCH] ci: simplify pipeline

---
 .gitea/workflows/fedora.yaml   | 35 ++++++++++++++--------------------
 .gitea/workflows/kali.yaml     | 12 +++++++-----
 containers/go/Containerfile    |  1 +
 containers/infra/Containerfile |  3 ++-
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/.gitea/workflows/fedora.yaml b/.gitea/workflows/fedora.yaml
index 14e65b9..90b73cb 100644
--- a/.gitea/workflows/fedora.yaml
+++ b/.gitea/workflows/fedora.yaml
@@ -3,21 +3,17 @@ on:
   push:
     branches: ["main"]
     paths:
-      [
-        "containers/fedora/**",
-        "containers/go/**",
-        "containers/infra/**",
-        ".gitea/workflows/kali.yaml",
-      ]
+      - "containers/fedora/**"
+      - "containers/go/**"
+      - "containers/infra/**"
+      - ".gitea/workflows/fedora.yaml"
   pull_request:
     branches: ["main"]
     paths:
-      [
-        "containers/fedora/**",
-        "containers/go/**",
-        "containers/infra/**",
-        ".gitea/workflows/kali.yaml",
-      ]
+      - "containers/fedora/**"
+      - "containers/go/**"
+      - "containers/infra/**"
+      - ".gitea/workflows/fedora.yaml"
   schedule:
     - cron: "0 16 * * FRI"
 
@@ -41,9 +37,8 @@ jobs:
           context: ./containers/fedora
           file: ./containers/fedora/Containerfile
           push: true
-          tags: |
-            git.plabble.org/job79/fedora:${{ github.ref_name }}
-            git.plabble.org/job79/fedora:latest
+          tags: git.plabble.org/job79/fedora:${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
       - name: Build and push go container
         uses: docker/build-push-action@v5
@@ -51,9 +46,8 @@ jobs:
           context: ./containers/go
           file: ./containers/go/Containerfile
           push: true
-          tags: |
-            git.plabble.org/job79/go:${{ github.ref_name }}
-            git.plabble.org/job79/go:latest
+          tags: git.plabble.org/job79/go:${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
       - name: Build and push infra container
         uses: docker/build-push-action@v5
@@ -61,7 +55,6 @@ jobs:
           context: ./containers/infra
           file: ./containers/infra/Containerfile
           push: true
-          tags: |
-            git.plabble.org/job79/infra:${{ github.ref_name }}
-            git.plabble.org/job79/infra:latest
+          tags: git.plabble.org/job79/infra:${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
diff --git a/.gitea/workflows/kali.yaml b/.gitea/workflows/kali.yaml
index 2dd7ddc..5d8e2cc 100644
--- a/.gitea/workflows/kali.yaml
+++ b/.gitea/workflows/kali.yaml
@@ -2,10 +2,14 @@ name: Build container
 on:
   push:
     branches: ["main"]
-    paths: ["containers/kali/**", ".gitea/workflows/kali.yaml"]
+    paths:
+      - "containers/kali/**"
+      - ".gitea/workflows/kali.yaml"
   pull_request:
     branches: ["main"]
-    paths: ["containers/kali/**", ".gitea/workflows/kali.yaml"]
+    paths:
+      - "containers/kali/**"
+      - ".gitea/workflows/kali.yaml"
   schedule:
     - cron: "0 16 * * FRI"
 
@@ -29,7 +33,5 @@ jobs:
           context: ./containers/kali
           file: ./containers/kali/Containerfile
           push: true
-          tags: |
-            git.plabble.org/job79/kali:${{ github.ref_name }}
-            git.plabble.org/job79/kali:latest
+          tags: git.plabble.org/job79/kali:${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
diff --git a/containers/go/Containerfile b/containers/go/Containerfile
index 06e2118..931895d 100644
--- a/containers/go/Containerfile
+++ b/containers/go/Containerfile
@@ -1,3 +1,4 @@
+ARG TAG
 FROM git.plabble.org/job79/fedora
 USER root
 RUN dnf -y install go
diff --git a/containers/infra/Containerfile b/containers/infra/Containerfile
index c816bf2..70f1418 100644
--- a/containers/infra/Containerfile
+++ b/containers/infra/Containerfile
@@ -1,4 +1,5 @@
-FROM git.plabble.org/job79/fedora
+ARG TAG
+FROM git.plabble.org/job79/fedora:${TAG}
 USER root
 RUN dnf -y install kubectl openssl
 RUN curl -sL https://talos.dev/install | sh