unkin/rpmbuilder
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

benvin/replace_release_el8 #77

Merged
unkinben merged 3 commits from benvin/replace_release_el8 into master 2026-01-17 20:39:07 +11:00
Conversation 0 Commits 3 Files Changed 82 +76 -73
37 changed files with 76 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d379d99b6 - Show all commits

4
.gitea/workflows/build.yaml
View File

@ -30,7 +30,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: rpms-8 name: rpms-8
path: /workspace/unkin/rpmbuilder/dist/*/*.rpm path: /workspace/unkin/rpmbuilder/dist/*/*/*.rpm
build-9: build-9:
runs-on: almalinux-8 runs-on: almalinux-8
@ -56,4 +56,4 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: rpms-9 name: rpms-9
path: /workspace/unkin/rpmbuilder/dist/*/*.rpm path: /workspace/unkin/rpmbuilder/dist/*/*/*.rpm

4
rpms/boilerplate/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.10.1 version: 0.10.1
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.10.1 version: 0.10.1

4
rpms/cni-plugins/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.9.0 version: 1.9.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.9.0 version: 1.9.0

4
rpms/consul/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.22.2 version: 1.22.2
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.22.2 version: 1.22.2

4
rpms/etcd/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 3.6.7 version: 3.6.7
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 3.6.7 version: 3.6.7

4
rpms/exportarr/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 2.3.0 version: 2.3.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 2.3.0 version: 2.3.0

4
rpms/frr_exporter/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.9.0 version: 1.9.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.9.0 version: 1.9.0

4
rpms/helmfile/metadata.yaml
View File

@ -12,10 +12,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.2.3 version: 1.2.3
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.2.3 version: 1.2.3

2
rpms/incus/metadata.yaml
View File

@ -10,5 +10,5 @@ builds:
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 6.20.0 version: 6.20.0

4
rpms/nfpm/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 2.44.1 version: 2.44.1
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 2.44.1 version: 2.44.1

4
rpms/node_exporter/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.10.2 version: 1.10.2
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.10.2 version: 1.10.2

4
rpms/nomad-autoscaler/metadata.yaml
View File

@ -12,10 +12,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.4.8 version: 0.4.8
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.4.8 version: 0.4.8

4
rpms/nzbget/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 2-el8 release: 2
version: '25.4' version: '25.4'
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 2-el9 release: 2
version: '25.4' version: '25.4'

4
rpms/openbao-plugin-secret-consul/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.1.0 version: 0.1.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.1.0 version: 0.1.0

4
rpms/openbao-plugin-secret-nomad/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.1.5 version: 0.1.5
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.1.5 version: 0.1.5

4
rpms/openbao-plugins/metadata.yaml
View File

@ -9,10 +9,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.0.0 version: 1.0.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.0.0 version: 1.0.0

4
rpms/packer/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.14.3 version: 1.14.3
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.14.3 version: 1.14.3

4
rpms/postgres_exporter/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.18.1 version: 0.18.1
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.18.1 version: 0.18.1

4
rpms/ruff/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.14.10 version: 0.14.10
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.14.10 version: 0.14.10

4
rpms/stalwart-cli/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.15.3 version: 0.15.3
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.15.3 version: 0.15.3

4
rpms/stalwart-foundationdb/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.15.3 version: 0.15.3
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.15.3 version: 0.15.3

4
rpms/stalwart/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.15.3 version: 0.15.3
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.15.3 version: 0.15.3

4
rpms/terraform/metadata.yaml
View File

@ -13,10 +13,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.14.3 version: 1.14.3
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.14.3 version: 1.14.3

4
rpms/terragrunt/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.96.1 version: 0.96.1
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.96.1 version: 0.96.1

4
rpms/tflint/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.60.0 version: 0.60.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.60.0 version: 0.60.0

4
rpms/uv/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.9.20 version: 0.9.20
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.9.20 version: 0.9.20

4
rpms/vals/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 0.43.0 version: 0.43.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 0.43.0 version: 0.43.0

4
rpms/vault/metadata.yaml
View File

@ -13,10 +13,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.21.1 version: 1.21.1
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.21.1 version: 1.21.1

4
rpms/victoria-logs/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.43.1 version: 1.43.1
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.43.1 version: 1.43.1

4
rpms/vlutils/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.43.1 version: 1.43.1
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.43.1 version: 1.43.1

4
rpms/vmagent/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.132.0 version: 1.132.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.132.0 version: 1.132.0

4
rpms/vmalert/metadata.yaml
View File

@ -10,10 +10,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.132.0 version: 1.132.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.132.0 version: 1.132.0

4
rpms/vminsert/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.132.0 version: 1.132.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.132.0 version: 1.132.0

4
rpms/vmselect/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.132.0 version: 1.132.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.132.0 version: 1.132.0

4
rpms/vmstorage/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.132.0 version: 1.132.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.132.0 version: 1.132.0

4
rpms/vmutils/metadata.yaml
View File

@ -11,10 +11,10 @@ builds:
- repository: - repository:
- almalinux/el8 - almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1-el8 release: 1
version: 1.132.0 version: 1.132.0
- repository: - repository:
- almalinux/el9 - almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1-el9 release: 1
version: 1.132.0 version: 1.132.0

7
tools/build
View File

@ -623,6 +623,7 @@ def build_package_docker(
package_version: str, package_version: str,
package_release: str, package_release: str,
dist_dir: Path, dist_dir: Path,
repository: str,
base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest", base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest",
dry_run: bool = False dry_run: bool = False
) -> bool: ) -> bool:
@ -635,6 +636,7 @@ def build_package_docker(
package_version: Package version package_version: Package version
package_release: Package release number package_release: Package release number
dist_dir: Directory to store built packages dist_dir: Directory to store built packages
repository: Repository path (e.g., 'almalinux/el9')
base_image: Base Docker image to use for building base_image: Base Docker image to use for building
dry_run: If True, only show what would be done dry_run: If True, only show what would be done
@ -644,8 +646,8 @@ def build_package_docker(
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
try: try:
# Ensure dist directory exists # Ensure dist directory exists with repository structure
package_dist_dir = dist_dir / package_name package_dist_dir = dist_dir / repository / package_name
if not dry_run: if not dry_run:
package_dist_dir.mkdir(parents=True, exist_ok=True) package_dist_dir.mkdir(parents=True, exist_ok=True)
@ -1085,6 +1087,7 @@ class Builder:
package_version=package_info.version, package_version=package_info.version,
package_release=package_info.release, package_release=package_info.release,
dist_dir=self.dist_dir, dist_dir=self.dist_dir,
repository=package_info.distro,
base_image=package_info.base_image, base_image=package_info.base_image,
dry_run=dry_run dry_run=dry_run
) )