From 6d379d99b69a23ed141a92c30cbcaac1fdbbdadd Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 3 Jan 2026 23:24:58 +1100 Subject: [PATCH 1/3] chore: update build job, fixed versions - changed all releases from 1-el8 and 1-el9 to 1 - updated build job to write files to per-repository directories --- .gitea/workflows/build.yaml | 4 ++-- rpms/boilerplate/metadata.yaml | 4 ++-- rpms/cni-plugins/metadata.yaml | 4 ++-- rpms/consul/metadata.yaml | 4 ++-- rpms/etcd/metadata.yaml | 4 ++-- rpms/exportarr/metadata.yaml | 4 ++-- rpms/frr_exporter/metadata.yaml | 4 ++-- rpms/helmfile/metadata.yaml | 4 ++-- rpms/incus/metadata.yaml | 2 +- rpms/nfpm/metadata.yaml | 4 ++-- rpms/node_exporter/metadata.yaml | 4 ++-- rpms/nomad-autoscaler/metadata.yaml | 4 ++-- rpms/nzbget/metadata.yaml | 4 ++-- rpms/openbao-plugin-secret-consul/metadata.yaml | 4 ++-- rpms/openbao-plugin-secret-nomad/metadata.yaml | 4 ++-- rpms/openbao-plugins/metadata.yaml | 4 ++-- rpms/packer/metadata.yaml | 4 ++-- rpms/postgres_exporter/metadata.yaml | 4 ++-- rpms/ruff/metadata.yaml | 4 ++-- rpms/stalwart-cli/metadata.yaml | 4 ++-- rpms/stalwart-foundationdb/metadata.yaml | 4 ++-- rpms/stalwart/metadata.yaml | 4 ++-- rpms/terraform/metadata.yaml | 4 ++-- rpms/terragrunt/metadata.yaml | 4 ++-- rpms/tflint/metadata.yaml | 4 ++-- rpms/uv/metadata.yaml | 4 ++-- rpms/vals/metadata.yaml | 4 ++-- rpms/vault/metadata.yaml | 4 ++-- rpms/victoria-logs/metadata.yaml | 4 ++-- rpms/vlutils/metadata.yaml | 4 ++-- rpms/vmagent/metadata.yaml | 4 ++-- rpms/vmalert/metadata.yaml | 4 ++-- rpms/vminsert/metadata.yaml | 4 ++-- rpms/vmselect/metadata.yaml | 4 ++-- rpms/vmstorage/metadata.yaml | 4 ++-- rpms/vmutils/metadata.yaml | 4 ++-- tools/build | 7 +++++-- 37 files changed, 76 insertions(+), 73 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d09960b..dd81a80 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -30,7 +30,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: rpms-8 - path: /workspace/unkin/rpmbuilder/dist/*/*.rpm + path: /workspace/unkin/rpmbuilder/dist/*/*/*.rpm build-9: runs-on: almalinux-8 @@ -56,4 +56,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: rpms-9 - path: /workspace/unkin/rpmbuilder/dist/*/*.rpm + path: /workspace/unkin/rpmbuilder/dist/*/*/*.rpm diff --git a/rpms/boilerplate/metadata.yaml b/rpms/boilerplate/metadata.yaml index 0f9ffa0..7359435 100644 --- a/rpms/boilerplate/metadata.yaml +++ b/rpms/boilerplate/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.10.1 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.10.1 diff --git a/rpms/cni-plugins/metadata.yaml b/rpms/cni-plugins/metadata.yaml index db151df..f6ed392 100644 --- a/rpms/cni-plugins/metadata.yaml +++ b/rpms/cni-plugins/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.9.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.9.0 diff --git a/rpms/consul/metadata.yaml b/rpms/consul/metadata.yaml index 2349853..bb17342 100644 --- a/rpms/consul/metadata.yaml +++ b/rpms/consul/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.22.2 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.22.2 diff --git a/rpms/etcd/metadata.yaml b/rpms/etcd/metadata.yaml index b53526a..f97ffa5 100644 --- a/rpms/etcd/metadata.yaml +++ b/rpms/etcd/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 3.6.7 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 3.6.7 diff --git a/rpms/exportarr/metadata.yaml b/rpms/exportarr/metadata.yaml index 4a61cda..aea8e29 100644 --- a/rpms/exportarr/metadata.yaml +++ b/rpms/exportarr/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 2.3.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 2.3.0 diff --git a/rpms/frr_exporter/metadata.yaml b/rpms/frr_exporter/metadata.yaml index 868d312..2d6ed95 100644 --- a/rpms/frr_exporter/metadata.yaml +++ b/rpms/frr_exporter/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.9.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.9.0 diff --git a/rpms/helmfile/metadata.yaml b/rpms/helmfile/metadata.yaml index 600a590..75d5302 100644 --- a/rpms/helmfile/metadata.yaml +++ b/rpms/helmfile/metadata.yaml @@ -12,10 +12,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.2.3 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.2.3 diff --git a/rpms/incus/metadata.yaml b/rpms/incus/metadata.yaml index e8ae0de..ff411d3 100644 --- a/rpms/incus/metadata.yaml +++ b/rpms/incus/metadata.yaml @@ -10,5 +10,5 @@ builds: - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 6.20.0 diff --git a/rpms/nfpm/metadata.yaml b/rpms/nfpm/metadata.yaml index c23ed85..3543175 100644 --- a/rpms/nfpm/metadata.yaml +++ b/rpms/nfpm/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 2.44.1 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 2.44.1 diff --git a/rpms/node_exporter/metadata.yaml b/rpms/node_exporter/metadata.yaml index f8a5d8c..de0837f 100644 --- a/rpms/node_exporter/metadata.yaml +++ b/rpms/node_exporter/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.10.2 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.10.2 diff --git a/rpms/nomad-autoscaler/metadata.yaml b/rpms/nomad-autoscaler/metadata.yaml index 6962ac8..9d9c3b9 100644 --- a/rpms/nomad-autoscaler/metadata.yaml +++ b/rpms/nomad-autoscaler/metadata.yaml @@ -12,10 +12,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.4.8 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.4.8 diff --git a/rpms/nzbget/metadata.yaml b/rpms/nzbget/metadata.yaml index b7198ba..7d0a320 100644 --- a/rpms/nzbget/metadata.yaml +++ b/rpms/nzbget/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 2-el8 + release: 2 version: '25.4' - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 2-el9 + release: 2 version: '25.4' diff --git a/rpms/openbao-plugin-secret-consul/metadata.yaml b/rpms/openbao-plugin-secret-consul/metadata.yaml index 4c1845e..3c5f632 100644 --- a/rpms/openbao-plugin-secret-consul/metadata.yaml +++ b/rpms/openbao-plugin-secret-consul/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.1.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.1.0 diff --git a/rpms/openbao-plugin-secret-nomad/metadata.yaml b/rpms/openbao-plugin-secret-nomad/metadata.yaml index 92aed3d..a7af86e 100644 --- a/rpms/openbao-plugin-secret-nomad/metadata.yaml +++ b/rpms/openbao-plugin-secret-nomad/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.1.5 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.1.5 diff --git a/rpms/openbao-plugins/metadata.yaml b/rpms/openbao-plugins/metadata.yaml index d128055..aa1320d 100644 --- a/rpms/openbao-plugins/metadata.yaml +++ b/rpms/openbao-plugins/metadata.yaml @@ -9,10 +9,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.0.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.0.0 diff --git a/rpms/packer/metadata.yaml b/rpms/packer/metadata.yaml index 6106a0b..e4a38bc 100644 --- a/rpms/packer/metadata.yaml +++ b/rpms/packer/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.14.3 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.14.3 diff --git a/rpms/postgres_exporter/metadata.yaml b/rpms/postgres_exporter/metadata.yaml index e78d049..42f01f5 100644 --- a/rpms/postgres_exporter/metadata.yaml +++ b/rpms/postgres_exporter/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.18.1 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.18.1 diff --git a/rpms/ruff/metadata.yaml b/rpms/ruff/metadata.yaml index 2b74741..488ca07 100644 --- a/rpms/ruff/metadata.yaml +++ b/rpms/ruff/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.14.10 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.14.10 diff --git a/rpms/stalwart-cli/metadata.yaml b/rpms/stalwart-cli/metadata.yaml index 0941074..53af641 100644 --- a/rpms/stalwart-cli/metadata.yaml +++ b/rpms/stalwart-cli/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.15.3 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.15.3 diff --git a/rpms/stalwart-foundationdb/metadata.yaml b/rpms/stalwart-foundationdb/metadata.yaml index 1358daf..99221ac 100644 --- a/rpms/stalwart-foundationdb/metadata.yaml +++ b/rpms/stalwart-foundationdb/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.15.3 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.15.3 diff --git a/rpms/stalwart/metadata.yaml b/rpms/stalwart/metadata.yaml index 932e96c..0e78b25 100644 --- a/rpms/stalwart/metadata.yaml +++ b/rpms/stalwart/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.15.3 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.15.3 diff --git a/rpms/terraform/metadata.yaml b/rpms/terraform/metadata.yaml index e169d60..6ef9f31 100644 --- a/rpms/terraform/metadata.yaml +++ b/rpms/terraform/metadata.yaml @@ -13,10 +13,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.14.3 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.14.3 diff --git a/rpms/terragrunt/metadata.yaml b/rpms/terragrunt/metadata.yaml index eb849c5..b503174 100644 --- a/rpms/terragrunt/metadata.yaml +++ b/rpms/terragrunt/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.96.1 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.96.1 diff --git a/rpms/tflint/metadata.yaml b/rpms/tflint/metadata.yaml index 8d681c4..f4f7382 100644 --- a/rpms/tflint/metadata.yaml +++ b/rpms/tflint/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.60.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.60.0 diff --git a/rpms/uv/metadata.yaml b/rpms/uv/metadata.yaml index 63874ec..98b758f 100644 --- a/rpms/uv/metadata.yaml +++ b/rpms/uv/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.9.20 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.9.20 diff --git a/rpms/vals/metadata.yaml b/rpms/vals/metadata.yaml index 8d77049..8caa00b 100644 --- a/rpms/vals/metadata.yaml +++ b/rpms/vals/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 0.43.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 0.43.0 diff --git a/rpms/vault/metadata.yaml b/rpms/vault/metadata.yaml index 37ce882..d0f3cdd 100644 --- a/rpms/vault/metadata.yaml +++ b/rpms/vault/metadata.yaml @@ -13,10 +13,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.21.1 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.21.1 diff --git a/rpms/victoria-logs/metadata.yaml b/rpms/victoria-logs/metadata.yaml index 707576c..e0de32e 100644 --- a/rpms/victoria-logs/metadata.yaml +++ b/rpms/victoria-logs/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.43.1 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.43.1 diff --git a/rpms/vlutils/metadata.yaml b/rpms/vlutils/metadata.yaml index 59a9e6e..f542817 100644 --- a/rpms/vlutils/metadata.yaml +++ b/rpms/vlutils/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.43.1 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.43.1 diff --git a/rpms/vmagent/metadata.yaml b/rpms/vmagent/metadata.yaml index c66ad96..c6e5826 100644 --- a/rpms/vmagent/metadata.yaml +++ b/rpms/vmagent/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.132.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.132.0 diff --git a/rpms/vmalert/metadata.yaml b/rpms/vmalert/metadata.yaml index dbec09e..248b4e0 100644 --- a/rpms/vmalert/metadata.yaml +++ b/rpms/vmalert/metadata.yaml @@ -10,10 +10,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.132.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.132.0 diff --git a/rpms/vminsert/metadata.yaml b/rpms/vminsert/metadata.yaml index cdefa93..c3a7095 100644 --- a/rpms/vminsert/metadata.yaml +++ b/rpms/vminsert/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.132.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.132.0 diff --git a/rpms/vmselect/metadata.yaml b/rpms/vmselect/metadata.yaml index 6bfb8fd..389a2c9 100644 --- a/rpms/vmselect/metadata.yaml +++ b/rpms/vmselect/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.132.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.132.0 diff --git a/rpms/vmstorage/metadata.yaml b/rpms/vmstorage/metadata.yaml index 5b65d67..1e6910d 100644 --- a/rpms/vmstorage/metadata.yaml +++ b/rpms/vmstorage/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.132.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.132.0 diff --git a/rpms/vmutils/metadata.yaml b/rpms/vmutils/metadata.yaml index 1a17515..700d5a5 100644 --- a/rpms/vmutils/metadata.yaml +++ b/rpms/vmutils/metadata.yaml @@ -11,10 +11,10 @@ builds: - repository: - almalinux/el8 image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest - release: 1-el8 + release: 1 version: 1.132.0 - repository: - almalinux/el9 image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest - release: 1-el9 + release: 1 version: 1.132.0 diff --git a/tools/build b/tools/build index f0df967..b1775e9 100755 --- a/tools/build +++ b/tools/build @@ -623,6 +623,7 @@ def build_package_docker( package_version: str, package_release: str, dist_dir: Path, + repository: str, base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest", dry_run: bool = False ) -> bool: @@ -635,6 +636,7 @@ def build_package_docker( package_version: Package version package_release: Package release number dist_dir: Directory to store built packages + repository: Repository path (e.g., 'almalinux/el9') base_image: Base Docker image to use for building dry_run: If True, only show what would be done @@ -644,8 +646,8 @@ def build_package_docker( logger = logging.getLogger(__name__) try: - # Ensure dist directory exists - package_dist_dir = dist_dir / package_name + # Ensure dist directory exists with repository structure + package_dist_dir = dist_dir / repository / package_name if not dry_run: package_dist_dir.mkdir(parents=True, exist_ok=True) @@ -1085,6 +1087,7 @@ class Builder: package_version=package_info.version, package_release=package_info.release, dist_dir=self.dist_dir, + repository=package_info.distro, base_image=package_info.base_image, dry_run=dry_run ) -- 2.47.3 From e09d0c4bc60263124c5ec443794eb1934240a2c5 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 17 Jan 2026 15:18:26 +1100 Subject: [PATCH 2/3] chore: update build tool, puppet-initial - update build tool with github_release_pattern - update puppet-initial to reduce impact on upgrades --- rpms/incus/metadata.yaml | 8 ++++---- rpms/jellyfin-ffmpeg-bin/metadata.yaml | 8 ++++---- rpms/openbao-plugins/metadata.yaml | 1 + rpms/puppet-initial/resources/scripts/postinstall.sh | 7 +++++-- rpms/puppet-initial/resources/scripts/preinstall.sh | 7 +++++-- tools/build | 7 ++++++- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/rpms/incus/metadata.yaml b/rpms/incus/metadata.yaml index ff411d3..656bf79 100644 --- a/rpms/incus/metadata.yaml +++ b/rpms/incus/metadata.yaml @@ -1,11 +1,11 @@ name: incus github: lxc/incus -description: incus package +description: Powerful system container and virtual machine manager arch: amd64 platform: linux -maintainer: '' -homepage: '' -license: '' +maintainer: unkin +homepage: https://linuxcontainers.org/incus/ +license: Apache-2.0 builds: - repository: - almalinux/el9 diff --git a/rpms/jellyfin-ffmpeg-bin/metadata.yaml b/rpms/jellyfin-ffmpeg-bin/metadata.yaml index a4df5b2..f9fbd96 100644 --- a/rpms/jellyfin-ffmpeg-bin/metadata.yaml +++ b/rpms/jellyfin-ffmpeg-bin/metadata.yaml @@ -1,11 +1,11 @@ name: jellyfin-ffmpeg-bin github: jellyfin/jellyfin-ffmpeg -description: jellyfin-ffmpeg-bin package +description: FFmpeg binary package optimized for Jellyfin media server arch: amd64 platform: linux -maintainer: '' -homepage: '' -license: '' +maintainer: unkin +homepage: https://github.com/jellyfin/jellyfin-ffmpeg +license: GPL-3.0 builds: - repository: - almalinux/el8 diff --git a/rpms/openbao-plugins/metadata.yaml b/rpms/openbao-plugins/metadata.yaml index aa1320d..25b1123 100644 --- a/rpms/openbao-plugins/metadata.yaml +++ b/rpms/openbao-plugins/metadata.yaml @@ -1,4 +1,5 @@ name: openbao-plugins +github: openbao/openbao-plugins description: Meta package that installs all OpenBao plugins arch: amd64 platform: linux diff --git a/rpms/puppet-initial/resources/scripts/postinstall.sh b/rpms/puppet-initial/resources/scripts/postinstall.sh index 6d1113f..af61eb5 100755 --- a/rpms/puppet-initial/resources/scripts/postinstall.sh +++ b/rpms/puppet-initial/resources/scripts/postinstall.sh @@ -1,3 +1,6 @@ #!/usr/bin/env bash -systemctl daemon-reload -systemctl enable puppet-initial.service +# Only run on fresh install, not upgrade +if [ "$1" -eq 1 ]; then + systemctl daemon-reload + systemctl enable puppet-initial.service +fi diff --git a/rpms/puppet-initial/resources/scripts/preinstall.sh b/rpms/puppet-initial/resources/scripts/preinstall.sh index a06c6bd..e52703b 100755 --- a/rpms/puppet-initial/resources/scripts/preinstall.sh +++ b/rpms/puppet-initial/resources/scripts/preinstall.sh @@ -1,3 +1,6 @@ #!/usr/bin/env bash -systemctl stop puppet -systemctl disable puppet +# Only run on fresh install, not upgrade +if [ "$1" -eq 1 ]; then + systemctl stop puppet + systemctl disable puppet +fi diff --git a/tools/build b/tools/build index b1775e9..8c2d765 100755 --- a/tools/build +++ b/tools/build @@ -105,7 +105,7 @@ METADATA_SCHEMA = { 'regex': r'^[a-zA-Z0-9\-_\.:\/]+$' }, 'release': { - 'type': 'string', + 'type': ['string', 'integer', 'float'], 'required': True, 'empty': False }, @@ -117,6 +117,11 @@ METADATA_SCHEMA = { } } } + }, + 'github_release_pattern': { + 'type': 'string', + 'required': False, + 'empty': False } } -- 2.47.3 From 1f1b1cfe32a06a2b295fffa90e11e3e01980316c Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 17 Jan 2026 19:44:33 +1100 Subject: [PATCH 3/3] chore: update urls to artifactapi - change github urls to artifactapi - change gitea urls to artifactapi - change scripts in nfpm to use full path - update unrar to 7.12 --- rpms/act_runner/resources/build.sh | 2 +- rpms/bind_exporter/resources/build.sh | 2 +- rpms/boilerplate/resources/build.sh | 2 +- rpms/cni-plugins/resources/build.sh | 2 +- rpms/etcd/resources/build.sh | 2 +- rpms/exportarr/resources/build.sh | 2 +- rpms/frr_exporter/resources/build.sh | 2 +- rpms/g10k/resources/build.sh | 2 +- rpms/helmfile/resources/build.sh | 2 +- rpms/incus/resources/build.sh | 2 +- rpms/jsonnet-language-server/resources/build.sh | 2 +- rpms/libfoundationdb/resources/build.sh | 2 +- rpms/node_exporter/resources/build.sh | 2 +- rpms/nzbget/resources/build.sh | 2 +- rpms/openbao-plugin-secret-consul/resources/build.sh | 2 +- rpms/openbao-plugin-secret-nomad/resources/build.sh | 2 +- rpms/pgbouncer_exporter/resources/build.sh | 2 +- rpms/postgres_exporter/resources/build.sh | 2 +- rpms/puppet-initial/resources/nfpm.yaml | 8 ++++---- rpms/puppetdb_exporter/resources/build.sh | 2 +- rpms/ruff/resources/build.sh | 2 +- rpms/stalwart-cli/resources/build.sh | 2 +- rpms/stalwart-foundationdb/resources/build.sh | 2 +- rpms/stalwart/resources/build.sh | 2 +- rpms/terragrunt/resources/build.sh | 2 +- rpms/tflint/resources/build.sh | 2 +- rpms/unkin-ca-certificates/resources/nfpm.yaml | 2 +- rpms/unkin-undionly-kpxe/resources/nfpm.yaml | 8 ++++---- rpms/unrar/metadata.yaml | 4 ++-- rpms/unrar/resources/build.sh | 2 +- rpms/uv/resources/build.sh | 2 +- rpms/vals/resources/build.sh | 2 +- rpms/victoria-logs/resources/build.sh | 2 +- rpms/vlutils/resources/build.sh | 2 +- rpms/vmagent/resources/build.sh | 2 +- rpms/vmalert/resources/build.sh | 2 +- rpms/vminsert/resources/build.sh | 2 +- rpms/vmselect/resources/build.sh | 2 +- rpms/vmstorage/resources/build.sh | 2 +- rpms/vmutils/resources/build.sh | 2 +- rpms/xh/resources/build.sh | 2 +- rpms/xh/resources/nfpm.yaml | 8 ++++---- tools/build | 1 + 43 files changed, 53 insertions(+), 52 deletions(-) diff --git a/rpms/act_runner/resources/build.sh b/rpms/act_runner/resources/build.sh index 0a0aec8..44b71c8 100755 --- a/rpms/act_runner/resources/build.sh +++ b/rpms/act_runner/resources/build.sh @@ -2,7 +2,7 @@ set -e -curl -L --output act_runner-linux-amd64 https://dl.gitea.com/act_runner/${PACKAGE_VERSION}/act_runner-${PACKAGE_VERSION}-linux-amd64 +curl -L --output act_runner-linux-amd64 https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/gitea-dl/act_runner/${PACKAGE_VERSION}/act_runner-${PACKAGE_VERSION}-linux-amd64 # Process the nfpm.yaml template with environment variables envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/bind_exporter/resources/build.sh b/rpms/bind_exporter/resources/build.sh index d03a7f6..4a6400d 100755 --- a/rpms/bind_exporter/resources/build.sh +++ b/rpms/bind_exporter/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download the required files -curl --output - -L https://github.com/prometheus-community/bind_exporter/releases/download/v${PACKAGE_VERSION}/bind_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - +curl --output - -L https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/prometheus-community/bind_exporter/releases/download/v${PACKAGE_VERSION}/bind_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - # Process nfpm.yaml with envsubst envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/boilerplate/resources/build.sh b/rpms/boilerplate/resources/build.sh index 21f736a..293b49a 100755 --- a/rpms/boilerplate/resources/build.sh +++ b/rpms/boilerplate/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download the required files -wget -O /app/boilerplate https://github.com/gruntwork-io/boilerplate/releases/download/v${PACKAGE_VERSION}/boilerplate_linux_amd64 +wget -O /app/boilerplate https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/gruntwork-io/boilerplate/releases/download/v${PACKAGE_VERSION}/boilerplate_linux_amd64 # Process nfpm.yaml with envsubst envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/cni-plugins/resources/build.sh b/rpms/cni-plugins/resources/build.sh index 364b9fd..1b1608e 100755 --- a/rpms/cni-plugins/resources/build.sh +++ b/rpms/cni-plugins/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download and extract cni-plugins -wget -O /app/cni-plugins-linux-amd64.tgz https://github.com/containernetworking/plugins/releases/download/v${PACKAGE_VERSION}/cni-plugins-linux-amd64-v${PACKAGE_VERSION}.tgz +wget -O /app/cni-plugins-linux-amd64.tgz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/containernetworking/plugins/releases/download/v${PACKAGE_VERSION}/cni-plugins-linux-amd64-v${PACKAGE_VERSION}.tgz tar xf cni-plugins-linux-amd64.tgz # Process nfpm.yaml with envsubst diff --git a/rpms/etcd/resources/build.sh b/rpms/etcd/resources/build.sh index 7fc0fd4..7575c48 100755 --- a/rpms/etcd/resources/build.sh +++ b/rpms/etcd/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download and extract etcd -wget -O /app/etcd-v${PACKAGE_VERSION}-linux-amd64.tar.gz https://github.com/etcd-io/etcd/releases/download/v${PACKAGE_VERSION}/etcd-v${PACKAGE_VERSION}-linux-amd64.tar.gz +wget -O /app/etcd-v${PACKAGE_VERSION}-linux-amd64.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/etcd-io/etcd/releases/download/v${PACKAGE_VERSION}/etcd-v${PACKAGE_VERSION}-linux-amd64.tar.gz tar xf /app/etcd-v${PACKAGE_VERSION}-linux-amd64.tar.gz mv /app/etcd-v${PACKAGE_VERSION}-linux-amd64/* /app/ diff --git a/rpms/exportarr/resources/build.sh b/rpms/exportarr/resources/build.sh index 78e3ea3..7b25f25 100755 --- a/rpms/exportarr/resources/build.sh +++ b/rpms/exportarr/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download the required files -curl --output - -L https://github.com/onedr0p/exportarr/releases/download/v${PACKAGE_VERSION}/exportarr_${PACKAGE_VERSION}_linux_amd64.tar.gz | tar --strip-components=1 -xzf - +curl --output - -L https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/onedr0p/exportarr/releases/download/v${PACKAGE_VERSION}/exportarr_${PACKAGE_VERSION}_linux_amd64.tar.gz | tar --strip-components=1 -xzf - # Process nfpm.yaml with envsubst envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/frr_exporter/resources/build.sh b/rpms/frr_exporter/resources/build.sh index 9199c0c..d8dcaa5 100755 --- a/rpms/frr_exporter/resources/build.sh +++ b/rpms/frr_exporter/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash set -e -curl --output - -L https://github.com/tynany/frr_exporter/releases/download/v${PACKAGE_VERSION}/frr_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - +curl --output - -L https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/tynany/frr_exporter/releases/download/v${PACKAGE_VERSION}/frr_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - # Process nfpm.yaml with envsubst envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/g10k/resources/build.sh b/rpms/g10k/resources/build.sh index c70eee5..93f27d5 100755 --- a/rpms/g10k/resources/build.sh +++ b/rpms/g10k/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download and extract g10k -wget -O /app/g10k.zip https://github.com/xorpaul/g10k/releases/download/v${PACKAGE_VERSION}/g10k-v${PACKAGE_VERSION}-linux-amd64.zip +wget -O /app/g10k.zip https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/xorpaul/g10k/releases/download/v${PACKAGE_VERSION}/g10k-v${PACKAGE_VERSION}-linux-amd64.zip pushd /app unzip /app/g10k.zip popd diff --git a/rpms/helmfile/resources/build.sh b/rpms/helmfile/resources/build.sh index d9af0bf..882dddf 100755 --- a/rpms/helmfile/resources/build.sh +++ b/rpms/helmfile/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/helmfile.tar.gz https://github.com/helmfile/helmfile/releases/download/v${PACKAGE_VERSION}/helmfile_${PACKAGE_VERSION}_linux_amd64.tar.gz +curl -L -o /app/helmfile.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/helmfile/helmfile/releases/download/v${PACKAGE_VERSION}/helmfile_${PACKAGE_VERSION}_linux_amd64.tar.gz # Extract the binary cd /app diff --git a/rpms/incus/resources/build.sh b/rpms/incus/resources/build.sh index 38ad84f..5d078cc 100755 --- a/rpms/incus/resources/build.sh +++ b/rpms/incus/resources/build.sh @@ -29,7 +29,7 @@ dnf makecache && dnf install -y \ curl-minimal # Download and extract incus source -curl -L -o /app/incus.tar.gz https://github.com/lxc/incus/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz +curl -L -o /app/incus.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/lxc/incus/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz tar -C /app -xf incus.tar.gz # Install specific Go version diff --git a/rpms/jsonnet-language-server/resources/build.sh b/rpms/jsonnet-language-server/resources/build.sh index 57a2075..403f982 100755 --- a/rpms/jsonnet-language-server/resources/build.sh +++ b/rpms/jsonnet-language-server/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/jsonnet-language-server https://github.com/grafana/jsonnet-language-server/releases/download/v${PACKAGE_VERSION}/jsonnet-language-server_${PACKAGE_VERSION}_linux_amd64 +curl -L -o /app/jsonnet-language-server https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/grafana/jsonnet-language-server/releases/download/v${PACKAGE_VERSION}/jsonnet-language-server_${PACKAGE_VERSION}_linux_amd64 # Make the binary executable chmod +x /app/jsonnet-language-server diff --git a/rpms/libfoundationdb/resources/build.sh b/rpms/libfoundationdb/resources/build.sh index 7a1b061..ece9ffd 100755 --- a/rpms/libfoundationdb/resources/build.sh +++ b/rpms/libfoundationdb/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required library -curl -L -o /app/libfdb_c.so https://github.com/apple/foundationdb/releases/download/${PACKAGE_VERSION}/libfdb_c.x86_64.so +curl -L -o /app/libfdb_c.so https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/apple/foundationdb/releases/download/${PACKAGE_VERSION}/libfdb_c.x86_64.so # Make the library readable chmod 755 /app/libfdb_c.so diff --git a/rpms/node_exporter/resources/build.sh b/rpms/node_exporter/resources/build.sh index e6924ad..1f4a91e 100755 --- a/rpms/node_exporter/resources/build.sh +++ b/rpms/node_exporter/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl --output - -L https://github.com/prometheus/node_exporter/releases/download/v${PACKAGE_VERSION}/node_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - +curl --output - -L https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/prometheus/node_exporter/releases/download/v${PACKAGE_VERSION}/node_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - # Process the nfpm.yaml template with environment variables envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/nzbget/resources/build.sh b/rpms/nzbget/resources/build.sh index 700a56e..81a3cf7 100755 --- a/rpms/nzbget/resources/build.sh +++ b/rpms/nzbget/resources/build.sh @@ -4,4 +4,4 @@ set -e # Download the pre-built RPM from GitHub releases curl -L -o /app/dist/nzbget-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.x86_64.rpm \ - https://github.com/nzbgetcom/nzbget/releases/download/v$PACKAGE_VERSION/nzbget-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.x86_64.rpm \ No newline at end of file + https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/nzbgetcom/nzbget/releases/download/v$PACKAGE_VERSION/nzbget-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.x86_64.rpm \ No newline at end of file diff --git a/rpms/openbao-plugin-secret-consul/resources/build.sh b/rpms/openbao-plugin-secret-consul/resources/build.sh index 1d9ec50..aa123e7 100755 --- a/rpms/openbao-plugin-secret-consul/resources/build.sh +++ b/rpms/openbao-plugin-secret-consul/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/openbao-plugin-secrets-consul.tar.gz https://github.com/openbao/openbao-plugins/releases/download/secrets-consul-v${PACKAGE_VERSION}/openbao-plugin-secrets-consul_linux_amd64_v1.tar.gz +curl -L -o /app/openbao-plugin-secrets-consul.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/openbao/openbao-plugins/releases/download/secrets-consul-v${PACKAGE_VERSION}/openbao-plugin-secrets-consul_linux_amd64_v1.tar.gz # Extract the binary tar -xzf /app/openbao-plugin-secrets-consul.tar.gz -C /app diff --git a/rpms/openbao-plugin-secret-nomad/resources/build.sh b/rpms/openbao-plugin-secret-nomad/resources/build.sh index 8a59f0e..2684664 100755 --- a/rpms/openbao-plugin-secret-nomad/resources/build.sh +++ b/rpms/openbao-plugin-secret-nomad/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/openbao-plugin-secrets-nomad.tar.gz https://github.com/openbao/openbao-plugins/releases/download/secrets-nomad-v${PACKAGE_VERSION}/openbao-plugin-secrets-nomad_linux_amd64_v1.tar.gz +curl -L -o /app/openbao-plugin-secrets-nomad.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/openbao/openbao-plugins/releases/download/secrets-nomad-v${PACKAGE_VERSION}/openbao-plugin-secrets-nomad_linux_amd64_v1.tar.gz # Extract the binary tar -xzf /app/openbao-plugin-secrets-nomad.tar.gz -C /app diff --git a/rpms/pgbouncer_exporter/resources/build.sh b/rpms/pgbouncer_exporter/resources/build.sh index 55f0c91..bbcec3f 100755 --- a/rpms/pgbouncer_exporter/resources/build.sh +++ b/rpms/pgbouncer_exporter/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download the required files -curl --output - -L https://github.com/prometheus-community/pgbouncer_exporter/releases/download/v${PACKAGE_VERSION}/pgbouncer_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - +curl --output - -L https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/prometheus-community/pgbouncer_exporter/releases/download/v${PACKAGE_VERSION}/pgbouncer_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - # Process nfpm.yaml with envsubst envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/postgres_exporter/resources/build.sh b/rpms/postgres_exporter/resources/build.sh index ceff5db..c60368d 100755 --- a/rpms/postgres_exporter/resources/build.sh +++ b/rpms/postgres_exporter/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download the required files -curl --output - -L https://github.com/prometheus-community/postgres_exporter/releases/download/v${PACKAGE_VERSION}/postgres_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - +curl --output - -L https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/prometheus-community/postgres_exporter/releases/download/v${PACKAGE_VERSION}/postgres_exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - # Process nfpm.yaml with envsubst envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/puppet-initial/resources/nfpm.yaml b/rpms/puppet-initial/resources/nfpm.yaml index 68ae453..bb8e86a 100644 --- a/rpms/puppet-initial/resources/nfpm.yaml +++ b/rpms/puppet-initial/resources/nfpm.yaml @@ -34,7 +34,7 @@ contents: # Scripts to run during installation/removal (optional) scripts: - postinstall: ./scripts/postinstall.sh - preremove: ./scripts/preremove.sh - postremove: ./scripts/postremove.sh - preinstall: ./scripts/preinstall.sh + postinstall: /app/resources/scripts/postinstall.sh + preremove: /app/resources/scripts/preremove.sh + postremove: /app/resources/scripts/postremove.sh + preinstall: /app/resources/scripts/preinstall.sh diff --git a/rpms/puppetdb_exporter/resources/build.sh b/rpms/puppetdb_exporter/resources/build.sh index c89fe7a..e05a85b 100755 --- a/rpms/puppetdb_exporter/resources/build.sh +++ b/rpms/puppetdb_exporter/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash set -e -curl --output - -L https://github.com/camptocamp/prometheus-puppetdb-exporter/releases/download/${PACKAGE_VERSION}/prometheus-puppetdb-exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - +curl --output - -L https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/camptocamp/prometheus-puppetdb-exporter/releases/download/${PACKAGE_VERSION}/prometheus-puppetdb-exporter-${PACKAGE_VERSION}.linux-amd64.tar.gz | tar --strip-components=1 -xzf - # Process nfpm.yaml with envsubst envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/ruff/resources/build.sh b/rpms/ruff/resources/build.sh index c8c2144..c2827db 100755 --- a/rpms/ruff/resources/build.sh +++ b/rpms/ruff/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download and extract ruff -wget -O /app/ruff-x86_64-unknown-linux-gnu.tar.gz https://github.com/astral-sh/ruff/releases/download/${PACKAGE_VERSION}/ruff-x86_64-unknown-linux-gnu.tar.gz +wget -O /app/ruff-x86_64-unknown-linux-gnu.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/astral-sh/ruff/releases/download/${PACKAGE_VERSION}/ruff-x86_64-unknown-linux-gnu.tar.gz tar xf /app/ruff-x86_64-unknown-linux-gnu.tar.gz mv /app/ruff-x86_64-unknown-linux-gnu/* /app/ diff --git a/rpms/stalwart-cli/resources/build.sh b/rpms/stalwart-cli/resources/build.sh index ca9d055..8156ab6 100755 --- a/rpms/stalwart-cli/resources/build.sh +++ b/rpms/stalwart-cli/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/stalwart-cli.tar.gz https://github.com/stalwartlabs/stalwart/releases/download/v${PACKAGE_VERSION}/stalwart-cli-x86_64-unknown-linux-gnu.tar.gz +curl -L -o /app/stalwart-cli.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/stalwartlabs/stalwart/releases/download/v${PACKAGE_VERSION}/stalwart-cli-x86_64-unknown-linux-gnu.tar.gz # Extract the binary tar -xzf /app/stalwart-cli.tar.gz -C /app diff --git a/rpms/stalwart-foundationdb/resources/build.sh b/rpms/stalwart-foundationdb/resources/build.sh index 9ebca50..e7212d4 100755 --- a/rpms/stalwart-foundationdb/resources/build.sh +++ b/rpms/stalwart-foundationdb/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/stalwart-foundationdb.tar.gz https://github.com/stalwartlabs/stalwart/releases/download/v${PACKAGE_VERSION}/stalwart-foundationdb-x86_64-unknown-linux-gnu.tar.gz +curl -L -o /app/stalwart-foundationdb.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/stalwartlabs/stalwart/releases/download/v${PACKAGE_VERSION}/stalwart-foundationdb-x86_64-unknown-linux-gnu.tar.gz # Extract the binary tar -xzf /app/stalwart-foundationdb.tar.gz -C /app diff --git a/rpms/stalwart/resources/build.sh b/rpms/stalwart/resources/build.sh index 35214c1..dcab2a9 100755 --- a/rpms/stalwart/resources/build.sh +++ b/rpms/stalwart/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/stalwart.tar.gz https://github.com/stalwartlabs/stalwart/releases/download/v${PACKAGE_VERSION}/stalwart-x86_64-unknown-linux-gnu.tar.gz +curl -L -o /app/stalwart.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/stalwartlabs/stalwart/releases/download/v${PACKAGE_VERSION}/stalwart-x86_64-unknown-linux-gnu.tar.gz # Extract the binary tar -xzf /app/stalwart.tar.gz -C /app diff --git a/rpms/terragrunt/resources/build.sh b/rpms/terragrunt/resources/build.sh index 7561b18..e9549a0 100755 --- a/rpms/terragrunt/resources/build.sh +++ b/rpms/terragrunt/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download terragrunt binary -wget -O /app/terragrunt https://github.com/gruntwork-io/terragrunt/releases/download/v${PACKAGE_VERSION}/terragrunt_linux_amd64 +wget -O /app/terragrunt https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/gruntwork-io/terragrunt/releases/download/v${PACKAGE_VERSION}/terragrunt_linux_amd64 # Process the nfpm.yaml template with environment variables envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml diff --git a/rpms/tflint/resources/build.sh b/rpms/tflint/resources/build.sh index c058634..fbf0517 100755 --- a/rpms/tflint/resources/build.sh +++ b/rpms/tflint/resources/build.sh @@ -2,7 +2,7 @@ set -e # Download tflint binary -wget -O /app/tflint_linux_amd64.zip https://github.com/terraform-linters/tflint/releases/download/v${PACKAGE_VERSION}/tflint_linux_amd64.zip +wget -O /app/tflint_linux_amd64.zip https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/terraform-linters/tflint/releases/download/v${PACKAGE_VERSION}/tflint_linux_amd64.zip # Extract the binary unzip -j /app/tflint_linux_amd64.zip -d /app/ diff --git a/rpms/unkin-ca-certificates/resources/nfpm.yaml b/rpms/unkin-ca-certificates/resources/nfpm.yaml index e3ec751..b036b29 100644 --- a/rpms/unkin-ca-certificates/resources/nfpm.yaml +++ b/rpms/unkin-ca-certificates/resources/nfpm.yaml @@ -32,7 +32,7 @@ contents: # Scripts to run during installation/removal (optional) scripts: - postinstall: ./scripts/postinstall.sh + postinstall: /app/resources/scripts/postinstall.sh # preinstall: ./scripts/preinstall.sh # preremove: ./scripts/preremove.sh # postremove: ./scripts/postremove.sh diff --git a/rpms/unkin-undionly-kpxe/resources/nfpm.yaml b/rpms/unkin-undionly-kpxe/resources/nfpm.yaml index 9676165..9074bf1 100644 --- a/rpms/unkin-undionly-kpxe/resources/nfpm.yaml +++ b/rpms/unkin-undionly-kpxe/resources/nfpm.yaml @@ -38,7 +38,7 @@ contents: # Scripts to run during installation/removal (optional) scripts: - preinstall: /app/resources/preinstall.sh -# postinstall: ./scripts/postinstall.sh -# preremove: ./scripts/preremove.sh -# postremove: ./scripts/postremove.sh + preinstall: /app/resources/scripts/preinstall.sh +# postinstall: /app/resources/scripts/postinstall.sh +# preremove: /app/resources/scripts/preremove.sh +# postremove: /app/resources/scripts/postremove.sh diff --git a/rpms/unrar/metadata.yaml b/rpms/unrar/metadata.yaml index 5bcfcc1..617194f 100644 --- a/rpms/unrar/metadata.yaml +++ b/rpms/unrar/metadata.yaml @@ -4,11 +4,11 @@ builds: - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest release: '1' repository: [almalinux/el8] - version: 7.11.0 + version: '7.12' - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest release: '1' repository: [almalinux/el9] - version: 7.11.0 + version: '7.12' description: WinRAR is a powerful archive manager. It can backup your data and reduce the size of email attachments, open and unpack RAR, ZIP and other files downloaded from Internet, create new archives in RAR and ZIP file format. github: unknown/unrar homepage: https://www.rarlab.com/ diff --git a/rpms/unrar/resources/build.sh b/rpms/unrar/resources/build.sh index b21599c..7fb6414 100755 --- a/rpms/unrar/resources/build.sh +++ b/rpms/unrar/resources/build.sh @@ -11,4 +11,4 @@ mv /app/rar/unrar /app/ # Process the nfpm.yaml template with environment variables envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml -nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm \ No newline at end of file +nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/uv/resources/build.sh b/rpms/uv/resources/build.sh index cd1e6b9..1b95934 100755 --- a/rpms/uv/resources/build.sh +++ b/rpms/uv/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download and extract uv -wget -O /app/uv-x86_64-unknown-linux-gnu.tar.gz https://github.com/astral-sh/uv/releases/download/${PACKAGE_VERSION}/uv-x86_64-unknown-linux-gnu.tar.gz +wget -O /app/uv-x86_64-unknown-linux-gnu.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/astral-sh/uv/releases/download/${PACKAGE_VERSION}/uv-x86_64-unknown-linux-gnu.tar.gz tar xf /app/uv-x86_64-unknown-linux-gnu.tar.gz mv /app/uv-x86_64-unknown-linux-gnu/* /app/ diff --git a/rpms/vals/resources/build.sh b/rpms/vals/resources/build.sh index 6884d7a..b6b0e1b 100755 --- a/rpms/vals/resources/build.sh +++ b/rpms/vals/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/vals.tar.gz https://github.com/helmfile/vals/releases/download/v${PACKAGE_VERSION}/vals_${PACKAGE_VERSION}_linux_amd64.tar.gz +curl -L -o /app/vals.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/helmfile/vals/releases/download/v${PACKAGE_VERSION}/vals_${PACKAGE_VERSION}_linux_amd64.tar.gz # Extract the binary cd /app diff --git a/rpms/victoria-logs/resources/build.sh b/rpms/victoria-logs/resources/build.sh index c5a8c7b..38d81e3 100755 --- a/rpms/victoria-logs/resources/build.sh +++ b/rpms/victoria-logs/resources/build.sh @@ -4,7 +4,7 @@ set -e # Download and extract victoria-logs curl -L -o /app/victoria-logs-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ - https://github.com/VictoriaMetrics/VictoriaLogs/releases/download/v${PACKAGE_VERSION}/victoria-logs-linux-amd64-v${PACKAGE_VERSION}.tar.gz + https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/VictoriaMetrics/VictoriaLogs/releases/download/v${PACKAGE_VERSION}/victoria-logs-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf victoria-logs-linux-amd64-v${PACKAGE_VERSION}.tar.gz # Process the nfpm.yaml template with environment variables diff --git a/rpms/vlutils/resources/build.sh b/rpms/vlutils/resources/build.sh index 0132cc1..5cabd05 100755 --- a/rpms/vlutils/resources/build.sh +++ b/rpms/vlutils/resources/build.sh @@ -4,7 +4,7 @@ set -e # Download and extract vlutils curl -L -o /app/vlutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ - https://github.com/VictoriaMetrics/VictoriaLogs/releases/download/v${PACKAGE_VERSION}/vlutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz + https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/VictoriaMetrics/VictoriaLogs/releases/download/v${PACKAGE_VERSION}/vlutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf vlutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz # Process the nfpm.yaml template with environment variables diff --git a/rpms/vmagent/resources/build.sh b/rpms/vmagent/resources/build.sh index fece99a..e4196cf 100755 --- a/rpms/vmagent/resources/build.sh +++ b/rpms/vmagent/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz +curl -L -o /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz # Process the nfpm.yaml template with environment variables diff --git a/rpms/vmalert/resources/build.sh b/rpms/vmalert/resources/build.sh index fece99a..e4196cf 100755 --- a/rpms/vmalert/resources/build.sh +++ b/rpms/vmalert/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz +curl -L -o /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz # Process the nfpm.yaml template with environment variables diff --git a/rpms/vminsert/resources/build.sh b/rpms/vminsert/resources/build.sh index f65b3bf..10183cb 100755 --- a/rpms/vminsert/resources/build.sh +++ b/rpms/vminsert/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz +curl -L -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz # Process the nfpm.yaml template with environment variables diff --git a/rpms/vmselect/resources/build.sh b/rpms/vmselect/resources/build.sh index 9fb7682..e4bf022 100755 --- a/rpms/vmselect/resources/build.sh +++ b/rpms/vmselect/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz +curl -L -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz tar -xf /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz -C /app # Process the nfpm.yaml template with environment variables diff --git a/rpms/vmstorage/resources/build.sh b/rpms/vmstorage/resources/build.sh index f65b3bf..10183cb 100755 --- a/rpms/vmstorage/resources/build.sh +++ b/rpms/vmstorage/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download the required files -curl -L -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz +curl -L -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz # Process the nfpm.yaml template with environment variables diff --git a/rpms/vmutils/resources/build.sh b/rpms/vmutils/resources/build.sh index 902375e..f7da482 100755 --- a/rpms/vmutils/resources/build.sh +++ b/rpms/vmutils/resources/build.sh @@ -4,7 +4,7 @@ set -e # Download and extract vmutils curl -L -o /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ - https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz + https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz # Process the nfpm.yaml template with environment variables diff --git a/rpms/xh/resources/build.sh b/rpms/xh/resources/build.sh index b3bc86d..aa7e242 100755 --- a/rpms/xh/resources/build.sh +++ b/rpms/xh/resources/build.sh @@ -3,7 +3,7 @@ set -e # Download and extract xh -wget -O /app/xh-v${PACKAGE_VERSION}-x86_64-unknown-linux-musl.tar.gz https://github.com/ducaale/xh/releases/download/v${PACKAGE_VERSION}/xh-v${PACKAGE_VERSION}-x86_64-unknown-linux-musl.tar.gz +wget -O /app/xh-v${PACKAGE_VERSION}-x86_64-unknown-linux-musl.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/ducaale/xh/releases/download/v${PACKAGE_VERSION}/xh-v${PACKAGE_VERSION}-x86_64-unknown-linux-musl.tar.gz tar xf /app/xh-v${PACKAGE_VERSION}-x86_64-unknown-linux-musl.tar.gz mv /app/xh-v${PACKAGE_VERSION}-x86_64-unknown-linux-musl/* /app/ diff --git a/rpms/xh/resources/nfpm.yaml b/rpms/xh/resources/nfpm.yaml index dfdfc6b..025e810 100644 --- a/rpms/xh/resources/nfpm.yaml +++ b/rpms/xh/resources/nfpm.yaml @@ -32,7 +32,7 @@ contents: # Scripts to run during installation/removal (optional) # scripts: -# preinstall: ./scripts/preinstall.sh -# postinstall: ./scripts/postinstall.sh -# preremove: ./scripts/preremove.sh -# postremove: ./scripts/postremove.sh +# preinstall: /app/resources/scripts/preinstall.sh +# postinstall: /app/resources/scripts/postinstall.sh +# preremove: /app/resources/scripts/preremove.sh +# postremove: /app/resources/scripts/postremove.sh diff --git a/tools/build b/tools/build index 8c2d765..0fb46ca 100755 --- a/tools/build +++ b/tools/build @@ -693,6 +693,7 @@ def build_package_docker( central_dockerfile = package_dir.parent.parent / "Dockerfile" build_args = [ 'docker', 'build', + '--pull', '-f', str(central_dockerfile), '--build-arg', f'BASE_IMAGE={base_image}', '--build-arg', f'PACKAGE_NAME={package_name}', -- 2.47.3