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

Compare commits

base: unkin:e09d0c4bc60263124c5ec443794eb1934240a2c5
Branches Tags
unkin:master
unkin:benvin/tooling
..
compare: unkin:9e02175eadaecd6d131554a08e6229917e00d6d8
Branches Tags
unkin:master
unkin:benvin/tooling

No commits in common. "e09d0c4bc60263124c5ec443794eb1934240a2c5" and "9e02175eadaecd6d131554a08e6229917e00d6d8" have entirely different histories.
e09d0c4bc6 ... 9e02175ead

40 changed files with 86 additions and 101 deletions
Show Stats Expand all files Collapse all files

4
.gitea/workflows/build.yaml
View File

@ -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

4
rpms/boilerplate/metadata.yaml
View File

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

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

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

4
rpms/consul/metadata.yaml
View File

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

4
rpms/etcd/metadata.yaml
View File

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

4
rpms/exportarr/metadata.yaml
View File

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

4
rpms/frr_exporter/metadata.yaml
View File

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

4
rpms/helmfile/metadata.yaml
View File

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

10
rpms/incus/metadata.yaml
View File

@ -1,14 +1,14 @@
name: incus
github: lxc/incus
description: Powerful system container and virtual machine manager
description: incus package
arch: amd64
platform: linux
maintainer: unkin
homepage: https://linuxcontainers.org/incus/
license: Apache-2.0
maintainer: ''
homepage: ''
license: ''
builds:
- repository:
- almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1
release: 1-el9
version: 6.20.0

8
rpms/jellyfin-ffmpeg-bin/metadata.yaml
View File

@ -1,11 +1,11 @@
name: jellyfin-ffmpeg-bin
github: jellyfin/jellyfin-ffmpeg
description: FFmpeg binary package optimized for Jellyfin media server
description: jellyfin-ffmpeg-bin package
arch: amd64
platform: linux
maintainer: unkin
homepage: https://github.com/jellyfin/jellyfin-ffmpeg
license: GPL-3.0
maintainer: ''
homepage: ''
license: ''
builds:
- repository:
- almalinux/el8

4
rpms/nfpm/metadata.yaml
View File

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

4
rpms/node_exporter/metadata.yaml
View File

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

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

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

4
rpms/nzbget/metadata.yaml
View File

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

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

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

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

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

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

@ -1,5 +1,4 @@
name: openbao-plugins
github: openbao/openbao-plugins
description: Meta package that installs all OpenBao plugins
arch: amd64
platform: linux
@ -10,10 +9,10 @@ builds:
- repository:
- almalinux/el8
image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
release: 1
release: 1-el8
version: 1.0.0
- repository:
- almalinux/el9
image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
release: 1
release: 1-el9
version: 1.0.0

4
rpms/packer/metadata.yaml
View File

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

4
rpms/postgres_exporter/metadata.yaml
View File

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

7
rpms/puppet-initial/resources/scripts/postinstall.sh
View File

@ -1,6 +1,3 @@
#!/usr/bin/env bash
# Only run on fresh install, not upgrade
if [ "$1" -eq 1 ]; then
systemctl daemon-reload
systemctl enable puppet-initial.service
fi
systemctl daemon-reload
systemctl enable puppet-initial.service

7
rpms/puppet-initial/resources/scripts/preinstall.sh
View File

@ -1,6 +1,3 @@
#!/usr/bin/env bash
# Only run on fresh install, not upgrade
if [ "$1" -eq 1 ]; then
systemctl stop puppet
systemctl disable puppet
fi
systemctl stop puppet
systemctl disable puppet

4
rpms/ruff/metadata.yaml
View File

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

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

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

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

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

4
rpms/stalwart/metadata.yaml
View File

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

4
rpms/terraform/metadata.yaml
View File

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

4
rpms/terragrunt/metadata.yaml
View File

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

4
rpms/tflint/metadata.yaml
View File

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

4
rpms/uv/metadata.yaml
View File

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

4
rpms/vals/metadata.yaml
View File

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

4
rpms/vault/metadata.yaml
View File

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

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

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

4
rpms/vlutils/metadata.yaml
View File

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

4
rpms/vmagent/metadata.yaml
View File

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

4
rpms/vmalert/metadata.yaml
View File

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

4
rpms/vminsert/metadata.yaml
View File

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

4
rpms/vmselect/metadata.yaml
View File

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

4
rpms/vmstorage/metadata.yaml
View File

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

4
rpms/vmutils/metadata.yaml
View File

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

14
tools/build
View File

@ -105,7 +105,7 @@ METADATA_SCHEMA = {
'regex': r'^[a-zA-Z0-9\-_\.:\/]+$'
},
'release': {
'type': ['string', 'integer', 'float'],
'type': 'string',
'required': True,
'empty': False
},
@ -117,11 +117,6 @@ METADATA_SCHEMA = {
}
}
}
},
'github_release_pattern': {
'type': 'string',
'required': False,
'empty': False
}
}
@ -628,7 +623,6 @@ 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:
@ -641,7 +635,6 @@ 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
@ -651,8 +644,8 @@ def build_package_docker(
logger = logging.getLogger(__name__)
try:
# Ensure dist directory exists with repository structure
package_dist_dir = dist_dir / repository / package_name
# Ensure dist directory exists
package_dist_dir = dist_dir / package_name
if not dry_run:
package_dist_dir.mkdir(parents=True, exist_ok=True)
@ -1092,7 +1085,6 @@ 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
)