Merge branch 'master' into update/etcd

Automated version bump: 0.14.10 → 0.15.12

Reviewed-on: #123

.gitea/workflows/build.yaml

@@ -1,55 +0,0 @@
-name: Build
-
-on:
-  pull_request:
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  build-8:
-    runs-on: almalinux-8
-    container:
-      image: git.unkin.net/unkin/almalinux8-actionsdind:latest
-      options: --privileged
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Build Packages
-        run: |
-          make all
-
-      - name: Show RPMs
-        run: |
-          find /workspace -type f -name "*.rpm"
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: rpms-8
-          path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
-
-  build-9:
-    runs-on: almalinux-8
-    container:
-      image: git.unkin.net/unkin/almalinux9-actionsdind:latest
-      options: --privileged
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Build Packages
-        run: |
-          make all
-
-      - name: Show RPMs
-        run: |
-          find /workspace -type f -name "*.rpm"
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: rpms-9
-          path: /workspace/unkin/rpmbuilder/dist/*/*.rpm

.gitea/workflows/deploy.yaml

@@ -1,66 +0,0 @@
-name: Deploy
-
-on:
-  push:
-    branches:
-      - master
-  workflow_dispatch:
-
-jobs:
-  deploy-8:
-    runs-on: almalinux-8
-    container:
-      image: git.unkin.net/unkin/almalinux8-actionsdind:latest
-      options: --privileged
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Download Artifacts
-        run: |
-          mkdir -p /workspace/unkin/rpmbuilder/dist/8
-          export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1))
-          curl -L -o /workspace/rpms.zip "https://git.unkin.net/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-8"
-          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/8
-
-      - name: Show RPMs
-        run: |
-          find /workspace -type f -name "*.rpm"
-
-      - name: Upload RPMs to Gitea
-        env:
-          DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
-        run: |
-          for rpm in $(find /workspace/unkin/rpmbuilder/dist/8 -type f -name "*.rpm"); do
-            curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el8/upload
-          done
-
-  deploy-9:
-    runs-on: almalinux-8
-    container:
-      image: git.unkin.net/unkin/almalinux9-actionsdind:latest
-      options: --privileged
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Download Artifacts
-        run: |
-          mkdir -p /workspace/unkin/rpmbuilder/dist/9
-          export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1))
-          curl -L -o /workspace/rpms.zip "https://git.unkin.net/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-9"
-          unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/9
-
-      - name: Show RPMs
-        run: |
-          find /workspace -type f -name "*.rpm"
-
-      - name: Upload RPMs to Gitea
-        env:
-          DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }}
-        run: |
-          for rpm in $(find /workspace/unkin/rpmbuilder/dist/9 -type f -name "*.rpm"); do
-            curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el9/upload
-          done

.gitignore

@@ -1 +1,4 @@
 dist
+env
+.claude
+.ruff_cache

.pre-commit-config.yaml

@@ -0,0 +1,41 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-executables-have-shebangs
+      - id: check-json
+      - id: check-added-large-files
+        args: ['--maxkb=500']
+      - id: check-merge-conflict
+      - id: check-shebang-scripts-are-executable
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-yaml
+        args: [--allow-multiple-documents]
+      - id: detect-aws-credentials
+        args: [--allow-missing-credentials]
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: forbid-new-submodules
+      - id: pretty-format-json
+      - id: trailing-whitespace
+
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.37.1
+    hooks:
+      - id: yamllint
+        args:
+          [
+            "-d {extends: relaxed, rules: {line-length: disable}}",
+            "-s",
+          ]
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.14.7
+    hooks:
+      # Run the linter.
+      - id: ruff-check
+        args: [--fix]
+      # Run the formatter.
+      - id: ruff-format

.woodpecker/build-almalinux8.yaml

@@ -0,0 +1,20 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: build rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - dnf install buildah -y
+      - ./tools/build build-all --distro almalinux/el8 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+
+  - name: show rpms
+    image: git.unkin.net/unkin/almalinux8-base:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"

.woodpecker/build-almalinux9.yaml

@@ -0,0 +1,20 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: build rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - dnf install buildah -y
+      - ./tools/build build-all --distro almalinux/el9 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+
+  - name: show rpms
+    image: git.unkin.net/unkin/almalinux9-base:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"

.woodpecker/deploy-almalinux8.yaml

@@ -0,0 +1,37 @@
+when:
+  - event: push
+    branch: master
+
+steps:
+  - name: build-rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - dnf install buildah -y
+      - ./tools/build build-all --distro almalinux/el8 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+
+  - name: show-rpms
+    image: git.unkin.net/unkin/almalinux9-base:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    depends_on: [build-rpms]
+
+  - name: deploy-rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - |
+        for rpm in $(find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"); do
+          curl --user droneci:$${DRONECI_PASSWORD} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el8/upload
+        done
+    environment:
+      DRONECI_PASSWORD:
+        from_secret: DRONECI_PASSWORD
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+    depends_on: [build-rpms, show-rpms]

.woodpecker/deploy-almalinux9.yaml

@@ -0,0 +1,37 @@
+when:
+  - event: push
+    branch: master
+
+steps:
+  - name: build-rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - dnf install buildah -y
+      - ./tools/build build-all --distro almalinux/el9 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+
+  - name: show-rpms
+    image: git.unkin.net/unkin/almalinux9-base:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    depends_on: [build-rpms]
+
+  - name: deploy-rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - |
+        for rpm in $(find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"); do
+          curl --user droneci:$${DRONECI_PASSWORD} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el9/upload
+        done
+    environment:
+      DRONECI_PASSWORD:
+        from_secret: DRONECI_PASSWORD
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+    depends_on: [build-rpms, show-rpms]

.woodpecker/pre-commit.yaml

@@ -0,0 +1,9 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: pre-commit
+    image: git.unkin.net/unkin/almalinux9-base:latest
+    commands:
+      - dnf install uv make -y
+      - uvx pre-commit run --all-files

Dockerfile

@@ -0,0 +1,34 @@
+ARG BASE_IMAGE=git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+FROM ${BASE_IMAGE}
+
+# Create output directory for RPMs
+RUN mkdir -p /app/dist
+
+# Set working directory
+WORKDIR /app
+
+# Accept all package metadata as build arguments and set as environment variables
+ARG PACKAGE_NAME
+ENV PACKAGE_NAME=${PACKAGE_NAME}
+ARG PACKAGE_VERSION
+ENV PACKAGE_VERSION=${PACKAGE_VERSION}
+ARG PACKAGE_RELEASE
+ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
+ARG PACKAGE_DESCRIPTION
+ENV PACKAGE_DESCRIPTION=${PACKAGE_DESCRIPTION}
+ARG PACKAGE_MAINTAINER
+ENV PACKAGE_MAINTAINER=${PACKAGE_MAINTAINER}
+ARG PACKAGE_HOMEPAGE
+ENV PACKAGE_HOMEPAGE=${PACKAGE_HOMEPAGE}
+ARG PACKAGE_LICENSE
+ENV PACKAGE_LICENSE=${PACKAGE_LICENSE}
+ARG PACKAGE_ARCH
+ENV PACKAGE_ARCH=${PACKAGE_ARCH}
+ARG PACKAGE_PLATFORM
+ENV PACKAGE_PLATFORM=${PACKAGE_PLATFORM}
+
+# Copy resources from the context into the container
+COPY resources /app/resources
+
+# Default command to build RPMs
+CMD /app/resources/build.sh

Makefile

@@ -1,58 +1,63 @@
 # Variables
 ROOT_DIR := $(PWD)
-RPMS_DIR := $(ROOT_DIR)/rpms
+BUILD_TOOL := $(ROOT_DIR)/tools/build
-REPO_OPTIONS := --disablerepo=* --enablerepo=unkin
+DISTRO ?= almalinux/el9
 
-# Automatically find all package/version directories
+# Authentication variables (optional)
-PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||" | grep -Ev '(scripts|/resources)')
+# VAULT_ROLE_ID - Use AppRole authentication if set
+# VAULT_ROLE - Kubernetes role for service account authentication (default: rpmbuilder)
 
-# Default target to build all packages and versions
+# Automatically find all packages with metadata.yaml
-.PHONY: all list cache build clean
+PACKAGES := $(shell find $(ROOT_DIR)/rpms -mindepth 1 -maxdepth 1 -type d -exec test -f {}/metadata.yaml \; -print | xargs -n1 basename | sort)
-all: cache $(PACKAGES)
 
+# Default target to build all packages
+.PHONY: all list build clean
+all: build-all
+
+# List all available packages
 list:
-	@echo "Builds:"
+	@echo "Available packages:"
 	@for package in $(PACKAGES); do \
-		echo "  '$$package'"; \
+		echo "  $$package"; \
 	done
 
-cache:
+# Build all packages using Python tool
-	echo "Refreshing DNF cache..." && \
+build-all:
-	dnf clean all && \
+	@echo "Building all packages using Python tooling for distro $(DISTRO)..."
-	dnf makecache
+	$(BUILD_TOOL) build-all --distro $(DISTRO)
 
-# Build specific package/version
+# Build all packages using native build (no Docker)
+build-all-native:
+	@echo "Building all packages natively (no Docker) for distro $(DISTRO)..."
+	$(BUILD_TOOL) build-all --distro $(DISTRO) --native
+
+# Build all packages using Buildah
+build-all-buildah:
+	@echo "Building all packages using Buildah for distro $(DISTRO)..."
+	$(BUILD_TOOL) build-all --distro $(DISTRO) --buildah
+
+# Build specific package using Python tool
 .PHONY: $(PACKAGES)
 $(PACKAGES):
-	@PACKAGE_NAME=$(shell echo $(@) | cut -d/ -f1) && \
+	@echo "Building package: $@ for distro $(DISTRO)"
-	PACKAGE_VERSION=$(shell echo $(@) | cut -d/ -f2) && \
+	$(BUILD_TOOL) build --distro $(DISTRO) $@
-	echo "Starting build $$PACKAGE_NAME/$$PACKAGE_VERSION" && \
-	$(MAKE) build PACKAGE_NAME=$$PACKAGE_NAME PACKAGE_VERSION=$$PACKAGE_VERSION
 
-# Build target
+# Dry run - show what would be built without building
-build:
+dry-run:
-	@mkdir -p $(ROOT_DIR)/dist/$(PACKAGE_NAME)/
+	@echo "Dry run - showing what would be built for distro $(DISTRO):"
-	@cd $(RPMS_DIR)/$(PACKAGE_NAME) && \
+	$(BUILD_TOOL) build-all --distro $(DISTRO) --dry-run
-		export PACKAGE_RELEASE=$$(cat $(PACKAGE_VERSION)/release) && \
-		export PACKAGE_FULL_NAME=$(PACKAGE_NAME)-$(PACKAGE_VERSION)-$$PACKAGE_RELEASE && \
-		echo "Checking repos for $$PACKAGE_FULL_NAME" && \
-		if dnf info $$PACKAGE_FULL_NAME $(REPO_OPTIONS) > /dev/null 2>&1; then \
-			echo "Skipping build for $(PACKAGE_NAME) version $(PACKAGE_VERSION) (already exists in the repository)"; \
-		else \
-			echo "Building RPM for $(PACKAGE_NAME) version $(PACKAGE_VERSION)"; \
-			docker build \
-				--build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \
-				--build-arg PACKAGE_RELEASE=$${PACKAGE_RELEASE} \
-				-t $$(echo $(PACKAGE_NAME)-builder \
-				| tr '[:upper:]' '[:lower:]') . && \
-			docker create --name $(PACKAGE_NAME)-$(PACKAGE_VERSION)-builder \
-				$$(echo $(PACKAGE_NAME)-builder | tr '[:upper:]' '[:lower:]') && \
-			docker start -a $(PACKAGE_NAME)-$(PACKAGE_VERSION)-builder && \
-			docker cp $(PACKAGE_NAME)-$(PACKAGE_VERSION)-builder:/app/dist/. $(ROOT_DIR)/dist/$(PACKAGE_NAME)/ && \
-			docker rm $(PACKAGE_NAME)-$(PACKAGE_VERSION)-builder; \
-		fi
 
 # Clean target
 clean:
 	@echo "Cleaning build artifacts..."
 	rm -rf $(ROOT_DIR)/dist
+
+# Update packages from GitHub releases
+update:
+	@echo "Checking for package updates from GitHub releases..."
+	$(ROOT_DIR)/tools/update-gh --all
+
+# Update specific package from GitHub
+update-%:
+	@echo "Checking for updates for package: $*"
+	$(ROOT_DIR)/tools/update-gh --package $*

rpms/act_runner/0.2.12/release

@@ -1 +0,0 @@
-1

rpms/act_runner/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy nfpm.yaml from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/act_runner/metadata.yaml

@@ -1,8 +1,18 @@
+---
+arch: amd64
+builds:
+  - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el8]
+    version: 0.2.12
+  - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el9]
+    version: 0.2.12
+description: A runner for Gitea based on act.
+github: unknown/act_runner
+homepage: https://gitea.com/gitea/act_runner
+license: MIT
+maintainer: Gitea
 name: act_runner
-release: 1
+platform: linux
-version: 0.2.12
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest

rpms/act_runner/resources/build.sh

@@ -1,3 +1,10 @@
 #!/usr/bin/bash
-curl --output act_runner-linux-amd64 https://dl.gitea.com/act_runner/${PACKAGE_VERSION}/act_runner-${PACKAGE_VERSION}-linux-amd64
+
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+set -e
+
+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
+
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/act_runner/resources/nfpm.yaml

@@ -1,16 +1,16 @@
 # nfpm.yaml
 
-name: act_runner
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "A runner for Gitea based on act."
+description: "${PACKAGE_DESCRIPTION}"
-maintainer: Gitea
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://gitea.com/gitea/act_runner
+homepage: ${PACKAGE_HOMEPAGE}
-license: MIT
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/bind_exporter/0.8.0/release

@@ -1 +0,0 @@
-1

rpms/bind_exporter/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/bind_exporter/metadata.yaml

@@ -1,8 +1,18 @@
+---
+arch: amd64
+builds:
+  - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el8]
+    version: 0.8.0
+  - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el9]
+    version: 0.8.0
+description: Prometheus exporter for BIND
+github: prometheus-community/bind_exporter
+homepage: https://github.com/prometheus-community/bind_exporter
+license: Apache-2.0 license
+maintainer: Prometheus
 name: bind_exporter
-release: 1
+platform: linux
-version: 0.8.0
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest

rpms/bind_exporter/resources/build.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/bash
+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 -
 
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+# Process nfpm.yaml with envsubst
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/bind_exporter/resources/nfpm.yaml

@@ -1,16 +1,16 @@
 # nfpm.yaml
 
-name: bind_exporter
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "Prometheus exporter for BIND"
+description: "${PACKAGE_DESCRIPTION}"
-maintainer: Prometheus
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://github.com/prometheus-community/bind_exporter
+homepage: ${PACKAGE_HOMEPAGE}
-license: Apache-2.0 license
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/boilerplate/0.6.1/release

@@ -1 +0,0 @@
-1

rpms/boilerplate/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/boilerplate/metadata.yaml

@@ -1,9 +1,20 @@
 name: boilerplate
-release: 1
-version: 0.6.1
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
 github: gruntwork-io/boilerplate
+description: Boilerplate is a tool for generating files and folders (boilerplate)
+  from a set of templates.
+arch: amd64
+platform: linux
+maintainer: Gruntwork
+homepage: https://github.com/gruntwork-io/boilerplate
+license: MIT
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 0.15.0
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 0.15.0

rpms/boilerplate/resources/build.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/bash
+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
 
 # Build the RPM
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/boilerplate/resources/nfpm.yaml

@@ -1,17 +1,17 @@
 # nfpm.yaml
 
-name: boilerplate
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "Boilerplate is a tool for generating files and folders (boilerplate) from a set of templates."
+description: "${PACKAGE_DESCRIPTION}"
 
-maintainer: Gruntwork
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://github.com/gruntwork-io/boilerplate
+homepage: ${PACKAGE_HOMEPAGE}
-license: MIT
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/claude-code/metadata.yaml

@@ -0,0 +1,19 @@
+arch: amd64
+builds:
+- image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  repository:
+  - almalinux/el8
+  version: 2.1.126
+- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  repository:
+  - almalinux/el9
+  version: 2.1.126
+claude_ai: true
+description: Claude Code - Anthropic's agentic AI coding tool
+homepage: https://claude.ai/code
+license: Proprietary
+maintainer: Anthropic
+name: claude-code
+platform: linux

rpms/claude-code/resources/build.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/bash
+
+set -e
+
+# Download claude-code binary
+wget -O /app/claude https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/claude-ai/claude-code-releases/${PACKAGE_VERSION}/linux-x64/claude
+chmod +x /app/claude
+
+# Process the nfpm.yaml template with environment variables
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
+# Build the RPM
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/claude-code/resources/nfpm.yaml

@@ -0,0 +1,33 @@
+# nfpm.yaml
+
+name: ${PACKAGE_NAME}
+version: ${PACKAGE_VERSION}
+release: ${PACKAGE_RELEASE}
+arch: ${PACKAGE_ARCH}
+platform: ${PACKAGE_PLATFORM}
+section: default
+priority: extra
+description: "${PACKAGE_DESCRIPTION}"
+
+maintainer: ${PACKAGE_MAINTAINER}
+homepage: ${PACKAGE_HOMEPAGE}
+license: ${PACKAGE_LICENSE}
+
+disable_globbing: false
+
+replaces:
+  - claude-code
+  - claude
+
+provides:
+  - claude-code
+  - claude
+
+# Files to include in the package
+contents:
+  - src: /app/claude
+    dst: /usr/bin/claude
+    file_info:
+      mode: 0755
+      owner: root
+      group: root

rpms/cni-plugins/1.7.1/release

@@ -1 +0,0 @@
-1

rpms/cni-plugins/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/cni-plugins/metadata.yaml

@@ -1,9 +1,20 @@
 name: cni-plugins
-release: 1
-version: 1.7.1
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
 github: containernetworking/plugins
+description: Some reference and example networking plugins, maintained by the CNI
+  team.
+arch: amd64
+platform: linux
+maintainer: ContainerNetworking
+homepage: https://github.com/containernetworking/plugins
+license: Apache-2.0
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 1.9.1
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 1.9.1

rpms/cni-plugins/resources/build.sh

@@ -1,8 +1,12 @@
 #!/usr/bin/bash
+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
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
 # Build the RPM
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/cni-plugins/resources/nfpm.yaml

@@ -1,17 +1,17 @@
 # nfpm.yaml
 
-name: cni-plugins
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "Some reference and example networking plugins, maintained by the CNI team."
+description: "${PACKAGE_DESCRIPTION}"
 
-maintainer: ContainerNetworking
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://github.com/containernetworking/plugins
+homepage: ${PACKAGE_HOMEPAGE}
-license: Apache-2.0
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/code-server/metadata.yaml

@@ -0,0 +1,20 @@
+---
+name: code-server
+github: coder/code-server
+description: VS Code in the browser.
+arch: amd64
+platform: linux
+maintainer: Coder
+homepage: https://github.com/coder/code-server
+license: MIT
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 4.117.0
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 4.117.0

rpms/code-server/resources/build.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/bash
+
+set -e
+
+curl -L -o /app/dist/code-server-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.x86_64.rpm \
+  https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/coder/code-server/releases/download/v${PACKAGE_VERSION}/code-server-${PACKAGE_VERSION}-amd64.rpm

rpms/code-server/resources/nfpm.yaml

@@ -0,0 +1,14 @@
+# nfpm.yaml - unused, RPM is downloaded directly in build.sh
+
+name: ${PACKAGE_NAME}
+version: ${PACKAGE_VERSION}
+release: ${PACKAGE_RELEASE}
+arch: ${PACKAGE_ARCH}
+platform: ${PACKAGE_PLATFORM}
+section: default
+priority: extra
+description: "${PACKAGE_DESCRIPTION}"
+
+maintainer: ${PACKAGE_MAINTAINER}
+homepage: ${PACKAGE_HOMEPAGE}
+license: ${PACKAGE_LICENSE}

rpms/consul-cni/1.7.1/release

@@ -1 +0,0 @@
-1

rpms/consul-cni/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/consul-cni/metadata.yaml

@@ -1,8 +1,18 @@
+---
+arch: amd64
+builds:
+  - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el8]
+    version: 1.7.1
+  - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el9]
+    version: 1.7.1
+description: Plugin for Consul on Kubernetes to allow configuring traffic redirection rules without escalated container privileges.
+github: unknown/consul-cni
+homepage: https://hashicorp.com
+license: Mozilla Public License, version 2.0
+maintainer: Hashicorp
 name: consul-cni
-release: 1
+platform: linux
-version: 1.7.1
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest

rpms/consul-cni/resources/build.sh

@@ -1,11 +1,15 @@
 #!/usr/bin/bash
 
+set -e
+
 # Install dependencies
 dnf install -y unzip
 
 # Download and extract consul-cni
-curl -o /app/consul-cni.zip https://releases.hashicorp.com/consul-cni/${PACKAGE_VERSION}/consul-cni_${PACKAGE_VERSION}_linux_amd64.zip
+curl -L -o /app/consul-cni.zip https://releases.hashicorp.com/consul-cni/${PACKAGE_VERSION}/consul-cni_${PACKAGE_VERSION}_linux_amd64.zip
 unzip consul-cni.zip
 
-# Build the RPM
+# Process the nfpm.yaml template with environment variables
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/consul-cni/resources/nfpm.yaml

@@ -1,16 +1,16 @@
 # nfpm.yaml
 
-name: consul-cni
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "Plugin for Consul on Kubernetes to allow configuring traffic redirection rules without escalated container privileges."
+description: "${PACKAGE_DESCRIPTION}"
-maintainer: Hashicorp
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://hashicorp.com
+homepage: ${PACKAGE_HOMEPAGE}
-license: Mozilla Public License, version 2.0
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/consul/1.21.1/release

@@ -1 +0,0 @@
-1

rpms/consul/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/consul/metadata.yaml

@@ -1,8 +1,20 @@
 name: consul
-release: 1
+github: hashicorp/consul
-version: 1.21.1
+description: Consul is a distributed, highly available, and data center aware solution
-build:
+  to connect and configure applications across dynamic, distributed infrastructure.
-- distro: el/8
+arch: amd64
+platform: linux
+maintainer: HashiCorp
+homepage: https://github.com/hashicorp/consul
+license: BUSL-1.1
+builds:
+- repository:
+  - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
+  release: 1
+  version: 1.22.7
+- repository:
+  - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 1.22.7

rpms/consul/resources/build.sh

@@ -1,11 +1,16 @@
 #!/usr/bin/bash
 
+set -e
+
 # Install dependencies
 dnf install -y unzip
 
 # Download and extract consul
-curl -o /app/consul.zip https://releases.hashicorp.com/consul/${PACKAGE_VERSION}/consul_${PACKAGE_VERSION}_linux_amd64.zip
+curl -L -o /app/consul.zip https://releases.hashicorp.com/consul/${PACKAGE_VERSION}/consul_${PACKAGE_VERSION}_linux_amd64.zip
 unzip consul.zip
 
+# Process the nfpm.yaml template with environment variables
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
 # Build the RPM
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/consul/resources/nfpm.yaml

@@ -1,17 +1,17 @@
 # nfpm.yaml
 
-name: consul
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure."
+description: "${PACKAGE_DESCRIPTION}"
 
-maintainer: HashiCorp
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://github.com/hashicorp/consul
+homepage: ${PACKAGE_HOMEPAGE}
-license: BUSL-1.1
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/etcd/3.5.18/release

@@ -1 +0,0 @@
-2

rpms/etcd/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/etcd/metadata.yaml

@@ -1,9 +1,20 @@
 name: etcd
-release: 2
-version: 3.5.18
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
 github: etcd-io/etcd
+description: A distributed, reliable key-value store for the most critical data of
+  a distributed system.
+arch: amd64
+platform: linux
+maintainer: https://etcd.io/
+homepage: https://etcd.io/
+license: Apache-2.0
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 3.6.10
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 3.6.10

rpms/etcd/resources/build.sh

@@ -1,9 +1,13 @@
 #!/usr/bin/bash
+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/
 
+# Process nfpm.yaml with envsubst
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
 # Build the RPM
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/etcd/resources/nfpm.yaml

@@ -1,17 +1,17 @@
 # nfpm.yaml
 
-name: etcd
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "A distributed, reliable key-value store for the most critical data of a distributed system."
+description: "${PACKAGE_DESCRIPTION}"
 
-maintainer: https://etcd.io/
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://etcd.io/
+homepage: ${PACKAGE_HOMEPAGE}
-license: Apache-2.0
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/exportarr/2.2.0/release

@@ -1 +0,0 @@
-1

rpms/exportarr/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/exportarr/metadata.yaml

@@ -1,8 +1,20 @@
 name: exportarr
-release: 1
+github: onedr0p/exportarr
-version: 2.2.0
+description: AIO Prometheus Exporter for Sabnzbd, Bazarr, Prowlarr, Lidarr, Readarr,
-build:
+  Radarr, and Sonarr
-- distro: el/8
+arch: amd64
+platform: linux
+maintainer: onedr0p
+homepage: https://github.com/onedr0p/exportarr
+license: MIT license
+builds:
+- repository:
+  - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
+  release: 1
+  version: 2.3.0
+- repository:
+  - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 2.3.0

rpms/exportarr/resources/build.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/bash
+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 -
 
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+# Process nfpm.yaml with envsubst
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/exportarr/resources/nfpm.yaml

@@ -1,16 +1,16 @@
 # nfpm.yaml
 
-name: exportarr
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "AIO Prometheus Exporter for Sabnzbd, Bazarr, Prowlarr, Lidarr, Readarr, Radarr, and Sonarr"
+description: "${PACKAGE_DESCRIPTION}"
-maintainer: onedr0p
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://github.com/onedr0p/exportarr
+homepage: ${PACKAGE_HOMEPAGE}
-license: MIT license
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/frr_exporter/1.8.0/release

@@ -1 +0,0 @@
-1

rpms/frr_exporter/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy nfpm.yaml from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/frr_exporter/metadata.yaml

@@ -1,9 +1,19 @@
 name: frr_exporter
-release: 1
-version: 1.8.0
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
 github: tynany/frr_exporter
+description: Prometheus exporter for Free Range Routing
+arch: amd64
+platform: linux
+maintainer: Prometheus
+homepage: https://github.com/tynany/frr_exporter
+license: MIT
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 1.11.0
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 1.11.0

rpms/frr_exporter/resources/build.sh

@@ -1,3 +1,9 @@
 #!/usr/bin/bash
-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 -
+set -e
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+
+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
+
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/frr_exporter/resources/nfpm.yaml

@@ -1,16 +1,16 @@
 # nfpm.yaml
 
-name: frr_exporter
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "Prometheus exporter for Free Range Routing"
+description: "${PACKAGE_DESCRIPTION}"
-maintainer: Prometheus
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://github.com/tynany/frr_exporter
+homepage: ${PACKAGE_HOMEPAGE}
-license: MIT
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/g10k/0.9.10/release

@@ -1 +0,0 @@
-1

rpms/g10k/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/g10k/metadata.yaml

@@ -1,9 +1,18 @@
-name: g10k
+---
-release: 1
+arch: amd64
-version: 0.9.10
+builds:
-build:
+  - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/8
+    release: '1'
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+    repository: [almalinux/el8]
-- distro: el/9
+    version: 0.9.10
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el9]
+    version: 0.9.10
+description: An r10k fork written in Go, designed to work somwhat similar like puppetlabs/r10k.
 github: xorpaul/g10k
+homepage: https://github.com/xorpaul/g10k
+license: Apache2.0
+maintainer: xorpaul
+name: g10k
+platform: linux

rpms/g10k/resources/build.sh

@@ -1,10 +1,14 @@
 #!/usr/bin/bash
+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
 
+# Process nfpm.yaml with envsubst
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
 # Build the RPM
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/g10k/resources/nfpm.yaml

@@ -1,17 +1,17 @@
 # nfpm.yaml
 
-name: g10k
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "An r10k fork written in Go, designed to work somwhat similar like puppetlabs/r10k."
+description: "${PACKAGE_DESCRIPTION}"
 
-maintainer: xorpaul
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://github.com/xorpaul/g10k
+homepage: ${PACKAGE_HOMEPAGE}
-license: Apache2.0
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/git-delta/metadata.yaml

@@ -0,0 +1,20 @@
+---
+name: git-delta
+github: dandavison/delta
+description: A syntax-highlighting pager for git, diff, grep, and blame output.
+arch: amd64
+platform: linux
+maintainer: dandavison
+homepage: https://github.com/dandavison/delta
+license: MIT
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 0.19.2
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 0.19.2

rpms/git-delta/resources/build.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/bash
+
+set -e
+
+# Note: delta releases use plain version tags (no v prefix)
+wget -O /app/delta-${PACKAGE_VERSION}-x86_64-unknown-linux-musl.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/dandavison/delta/releases/download/${PACKAGE_VERSION}/delta-${PACKAGE_VERSION}-x86_64-unknown-linux-musl.tar.gz
+tar xf /app/delta-${PACKAGE_VERSION}-x86_64-unknown-linux-musl.tar.gz
+mv /app/delta-${PACKAGE_VERSION}-x86_64-unknown-linux-musl/delta /app/delta
+
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/git-delta/resources/nfpm.yaml

@@ -0,0 +1,30 @@
+# nfpm.yaml
+
+name: ${PACKAGE_NAME}
+version: ${PACKAGE_VERSION}
+release: ${PACKAGE_RELEASE}
+arch: ${PACKAGE_ARCH}
+platform: ${PACKAGE_PLATFORM}
+section: default
+priority: extra
+description: "${PACKAGE_DESCRIPTION}"
+
+maintainer: ${PACKAGE_MAINTAINER}
+homepage: ${PACKAGE_HOMEPAGE}
+license: ${PACKAGE_LICENSE}
+
+disable_globbing: false
+
+replaces:
+  - git-delta
+
+provides:
+  - git-delta
+
+contents:
+  - src: /app/delta
+    dst: /usr/bin/delta
+    file_info:
+      mode: 0755
+      owner: root
+      group: root

rpms/hadolint/metadata.yaml

@@ -0,0 +1,20 @@
+---
+name: hadolint
+github: hadolint/hadolint
+description: A smarter Dockerfile linter that helps you build best practice Docker images.
+arch: amd64
+platform: linux
+maintainer: hadolint
+homepage: https://github.com/hadolint/hadolint
+license: GPL-3.0
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 2.14.0
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 2.14.0

rpms/hadolint/resources/build.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/bash
+
+set -e
+
+wget -O /app/hadolint https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/hadolint/hadolint/releases/download/v${PACKAGE_VERSION}/hadolint-linux-x86_64
+chmod +x /app/hadolint
+
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/hadolint/resources/nfpm.yaml

@@ -0,0 +1,30 @@
+# nfpm.yaml
+
+name: ${PACKAGE_NAME}
+version: ${PACKAGE_VERSION}
+release: ${PACKAGE_RELEASE}
+arch: ${PACKAGE_ARCH}
+platform: ${PACKAGE_PLATFORM}
+section: default
+priority: extra
+description: "${PACKAGE_DESCRIPTION}"
+
+maintainer: ${PACKAGE_MAINTAINER}
+homepage: ${PACKAGE_HOMEPAGE}
+license: ${PACKAGE_LICENSE}
+
+disable_globbing: false
+
+replaces:
+  - hadolint
+
+provides:
+  - hadolint
+
+contents:
+  - src: /app/hadolint
+    dst: /usr/bin/hadolint
+    file_info:
+      mode: 0755
+      owner: root
+      group: root

rpms/helm/metadata.yaml

@@ -0,0 +1,19 @@
+name: helm
+github: helm/helm
+description: The Kubernetes Package Manager
+arch: amd64
+platform: linux
+maintainer: Helm Contributors
+homepage: https://github.com/helm/helm
+license: Apache-2.0 license
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 4.1.4
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 4.1.4

rpms/helm/resources/build.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/bash
+
+set -e
+
+# Download the required files
+curl -L -o /app/helm.tar.gz https://get.helm.sh/helm-v${PACKAGE_VERSION}-linux-amd64.tar.gz
+
+# Extract the binary
+cd /app
+tar -xzf helm.tar.gz
+
+# Make the binary executable
+chmod +x /app/linux-amd64/helm
+
+# 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

rpms/helm/resources/nfpm.yaml

@@ -0,0 +1,39 @@
+---
+# nfpm.yaml
+
+name: ${PACKAGE_NAME}
+version: ${PACKAGE_VERSION}
+release: ${PACKAGE_RELEASE}
+arch: ${PACKAGE_ARCH}
+platform: ${PACKAGE_PLATFORM}
+section: default
+priority: extra
+description: "${PACKAGE_DESCRIPTION}"
+
+maintainer: ${PACKAGE_MAINTAINER}
+homepage: ${PACKAGE_HOMEPAGE}
+license: ${PACKAGE_LICENSE}
+
+disable_globbing: false
+
+replaces:
+  - helm
+
+provides:
+  - helm
+
+# Files to include in the package
+contents:
+  - src: /app/linux-amd64/helm
+    dst: /usr/bin/helm
+    file_info:
+      mode: 0755
+      owner: root
+      group: root
+
+# Scripts to run during installation/removal (optional)
+# scripts:
+#   preinstall: ./scripts/preinstall.sh
+#   postinstall: ./scripts/postinstall.sh
+#   preremove: ./scripts/preremove.sh
+#   postremove: ./scripts/postremove.sh

rpms/helmfile/1.1.7/release

@@ -1 +0,0 @@
-1

rpms/helmfile/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/helmfile/metadata.yaml

@@ -1,9 +1,21 @@
 name: helmfile
-release: 1
-version: 1.1.7
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
 github: helmfile/helmfile
+description: A declarative spec for deploying Helm charts. It lets you keep a directory
+  of chart value files and maintain changes in version control; apply CI/CD to configuration
+  changes; and periodically sync to avoid skew in environments.
+arch: amd64
+platform: linux
+maintainer: Helmfile Contributors
+homepage: https://github.com/helmfile/helmfile
+license: MIT
+builds:
+- repository:
+  - almalinux/el8
+  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  release: 1
+  version: 1.4.4
+- repository:
+  - almalinux/el9
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 1.4.4

rpms/helmfile/resources/build.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/bash
 
+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
@@ -10,5 +12,7 @@ tar -xzf helmfile.tar.gz
 # Make the binary executable
 chmod +x /app/helmfile
 
-# Build the RPM
+# Process the nfpm.yaml template with environment variables
-nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm
+envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
+
+nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/helmfile/resources/nfpm.yaml

@@ -1,17 +1,18 @@
+---
 # nfpm.yaml
 
-name: helmfile
+name: ${PACKAGE_NAME}
 version: ${PACKAGE_VERSION}
 release: ${PACKAGE_RELEASE}
-arch: amd64
+arch: ${PACKAGE_ARCH}
-platform: linux
+platform: ${PACKAGE_PLATFORM}
 section: default
 priority: extra
-description: "A declarative spec for deploying Helm charts. It lets you keep a directory of chart value files and maintain changes in version control; apply CI/CD to configuration changes; and periodically sync to avoid skew in environments."
+description: "${PACKAGE_DESCRIPTION}"
 
-maintainer: Helmfile Contributors
+maintainer: ${PACKAGE_MAINTAINER}
-homepage: https://github.com/helmfile/helmfile
+homepage: ${PACKAGE_HOMEPAGE}
-license: MIT
+license: ${PACKAGE_LICENSE}
 
 disable_globbing: false
 

rpms/incus/6.10.1/release

@@ -1 +0,0 @@
-1

rpms/incus/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/incus/metadata.yaml

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

rpms/incus/resources/build.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/bash
 
+set -e
+
 # Install build dependencies
-dnf install -y \
+dnf makecache && dnf install -y \
       unzip \
       libtool \
       autoconf \
@@ -24,14 +26,14 @@ dnf install -y \
       bash-completion \
       gettext \
       help2man \
-      curl
+      curl-minimal
 
 # Download and extract incus source
-curl -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
-curl -O https://go.dev/dl/go1.24.1.linux-amd64.tar.gz
+curl -L -O https://go.dev/dl/go1.24.1.linux-amd64.tar.gz
 rm -rf /usr/local/go
 tar -C /usr/local -xzf go1.24.1.linux-amd64.tar.gz
 

rpms/incus/resources/nfpm_incus.yaml

@@ -92,7 +92,7 @@ contents:
 
 # Scripts to run during installation/removal (optional)
 scripts:
-  postinstall: ./scripts/postinstall.sh
+  postinstall: ./resources/scripts/postinstall.sh
-  preremove: ./scripts/preremove.sh
+  preremove: ./resources/scripts/preremove.sh
-  postremove: ./scripts/postremove.sh
+  postremove: ./resources/scripts/postremove.sh
-  preinstall: ./scripts/preinstall.sh
+  preinstall: ./resources/scripts/preinstall.sh

rpms/jellyfin-ffmpeg-bin/7.1.1/release

@@ -1 +0,0 @@
-3

rpms/jellyfin-ffmpeg-bin/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/jellyfin-ffmpeg-bin/metadata.yaml

@@ -1,8 +1,19 @@
 name: jellyfin-ffmpeg-bin
-release: 3
+github: jellyfin/jellyfin-ffmpeg
-version: 7.1.1
+description: FFmpeg binary package optimized for Jellyfin media server
-build:
+arch: amd64
-- distro: el/8
+platform: linux
+maintainer: unkin
+homepage: https://github.com/jellyfin/jellyfin-ffmpeg
+license: GPL-3.0
+builds:
+- repository:
+  - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
+  release: 1.1
+  version: 7.1.3
+- repository:
+  - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1.1
+  version: 7.1.3

rpms/jellyfin-ffmpeg-bin/resources/build.sh

@@ -3,12 +3,15 @@
 # Setup rpmbuild directory structure
 mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
+# Process the spec file template with environment variables
+envsubst < /app/resources/jellyfin-ffmpeg-bin.spec.template > /root/rpmbuild/SPECS/jellyfin-ffmpeg-bin.spec
+
 # Download source files using spectool
-spectool -g -R /app/resources/jellyfin-ffmpeg-bin_${PACKAGE_VERSION}.spec
+spectool -g -R /root/rpmbuild/SPECS/jellyfin-ffmpeg-bin.spec
 
 # Build the RPM
-rpmbuild -ba /app/resources/jellyfin-ffmpeg-bin_${PACKAGE_VERSION}.spec
+rpmbuild -ba /root/rpmbuild/SPECS/jellyfin-ffmpeg-bin.spec
 
 # Copy the built RPMs to output directory
-cp /root/rpmbuild/RPMS/x86_64/jellyfin-ffmpeg-bin-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.*.rpm /app/dist/
+cp /root/rpmbuild/RPMS/x86_64/jellyfin-ffmpeg-bin-*.rpm /app/dist/
-cp /root/rpmbuild/SRPMS/jellyfin-ffmpeg-bin-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.*.rpm /app/dist
+cp /root/rpmbuild/SRPMS/jellyfin-ffmpeg-bin-*.rpm /app/dist

rpms/jellyfin-ffmpeg-bin/resources/jellyfin-ffmpeg-bin.spec.template

@@ -1,20 +1,20 @@
 %global debug_package %{nil}
 %define _missing_build_ids_terminate_build 0
-%global jellyfin_release 3
+%global jellyfin_release 1
 
 
-Name:    jellyfin-ffmpeg-bin
+Name:    ${PACKAGE_NAME}
-Version: 7.1.1
+Version: ${PACKAGE_VERSION}
-Release: %{jellyfin_release}
+Release: ${PACKAGE_RELEASE}
 Summary: FFmpeg for Jellyfin with custom extensions and enhancements
 
 
 License: GPL-3.0-only
 URL:     https://github.com/jellyfin/jellyfin-ffmpeg
-Source0: https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v%{version}-%{jellyfin_release}/jellyfin-ffmpeg_%{version}-%{jellyfin_release}_portable_linux64-gpl.tar.xz
+Source0: https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v${PACKAGE_VERSION}-1/jellyfin-ffmpeg_${PACKAGE_VERSION}-1_portable_linux64-gpl.tar.xz
-Source1: https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v%{version}-%{jellyfin_release}/jellyfin-ffmpeg_%{version}-%{jellyfin_release}_portable_linuxarm64-gpl.tar.xz
+Source1: https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v${PACKAGE_VERSION}-1/jellyfin-ffmpeg_${PACKAGE_VERSION}-1_portable_linuxarm64-gpl.tar.xz
-Source2: https://raw.githubusercontent.com/jellyfin/jellyfin-ffmpeg/v%{version}-%{jellyfin_release}/LICENSE.md
+Source2: https://raw.githubusercontent.com/jellyfin/jellyfin-ffmpeg/v${PACKAGE_VERSION}-1/LICENSE.md
-Source3: https://raw.githubusercontent.com/jellyfin/jellyfin-ffmpeg/v%{version}-%{jellyfin_release}/README.md
+Source3: https://raw.githubusercontent.com/jellyfin/jellyfin-ffmpeg/v${PACKAGE_VERSION}-1/README.md
 
 
 ExclusiveArch: x86_64 aarch64

rpms/jellyfin-server/10.10.7/release

@@ -1 +0,0 @@
-1

rpms/jellyfin-server/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/jellyfin-server/metadata.yaml

@@ -1,8 +1,13 @@
+---
+builds:
+  - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el8]
+    version: 10.10.7
+  - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el9]
+    version: 10.10.7
+description: jellyfin-server package
+github: unknown/jellyfin-server
 name: jellyfin-server
-release: 1
-version: 10.10.7
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest

rpms/jellyfin-web/10.10.7/release

@@ -1 +0,0 @@
-1

rpms/jellyfin-web/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh

rpms/jellyfin-web/metadata.yaml

@@ -1,8 +1,13 @@
+---
+builds:
+  - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el8]
+    version: 10.10.7
+  - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    release: '1'
+    repository: [almalinux/el9]
+    version: 10.10.7
+description: jellyfin-web package
+github: unknown/jellyfin-web
 name: jellyfin-web
-release: 1
-version: 10.10.7
-build:
-- distro: el/8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-- distro: el/9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest

rpms/jsonnet-language-server/0.16.0/release

@@ -1 +0,0 @@
-1

rpms/jsonnet-language-server/Dockerfile

@@ -1,18 +0,0 @@
-FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-
-# Create output directory for RPMs
-RUN mkdir -p /app/dist
-
-# Set working directory
-WORKDIR /app
-
-ARG PACKAGE_RELEASE
-ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
-ARG PACKAGE_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-
-# Copy resources from the context into the container
-COPY resources /app/resources
-
-# Default command to build RPMs
-CMD /app/resources/build.sh