.gitea/workflows/build.yaml

@@ -9,7 +9,7 @@ jobs:
   build-8:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux8-actionsdind:latest
+      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
       options: --privileged
 
     steps:
@@ -33,7 +33,7 @@ jobs:
   build-9:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux9-actionsdind:latest
+      image: git.query.consul/unkin/almalinux9-runnerdnd:latest
       options: --privileged
 
     steps:

.gitea/workflows/deploy.yaml

@@ -10,7 +10,7 @@ jobs:
   deploy-8:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux8-actionsdind:latest
+      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
       options: --privileged
 
     steps:
@@ -39,7 +39,7 @@ jobs:
   deploy-9:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux9-actionsdind:latest
+      image: git.query.consul/unkin/almalinux9-runnerdnd:latest
       options: --privileged
 
     steps:

Makefile

@@ -4,17 +4,14 @@ RPMS_DIR := $(ROOT_DIR)/rpms
 REPO_OPTIONS := --disablerepo=* --enablerepo=unkin
 
 # Automatically find all package/version directories
-PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||" | grep -Ev '(scripts|/resources)')
+PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||" | grep -v "/scripts")
 
 # Default target to build all packages and versions
 .PHONY: all list cache build clean
 all: cache $(PACKAGES)
 
 list:
-	@echo "Builds:"
+	@echo "$(PACKAGES)"
-	@for package in $(PACKAGES); do \
-		echo "  '$$package'"; \
-	done
 
 cache:
 	echo "Refreshing DNF cache..." && \

rpms/cni-plugins/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/consul/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/etcd/3.5.18/release

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

rpms/etcd/Dockerfile

@@ -1,25 +0,0 @@
-# Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-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 nfpm.yaml /app/nfpm.yaml
-COPY resources /app/resources
-
-# Download the required files
-RUN 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 && \
-    tar xf /app/etcd-v${PACKAGE_VERSION}-linux-amd64.tar.gz && \
-    mv /app/etcd-v${PACKAGE_VERSION}-linux-amd64/* /app/
-
-# Default command to build RPMs
-CMD nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/etcd/nfpm.yaml

@@ -1,60 +0,0 @@
-# nfpm.yaml
-
-name: etcd
-version: ${PACKAGE_VERSION}
-release: ${PACKAGE_RELEASE}
-arch: amd64
-platform: linux
-section: default
-priority: extra
-description: "A distributed, reliable key-value store for the most critical data of a distributed system."
-
-maintainer: https://etcd.io/
-homepage: https://etcd.io/
-license: Apache-2.0
-
-disable_globbing: false
-
-replaces:
-  - etcd
-  - etcdctl
-  - etcdutl
-
-provides:
-  - etcd
-  - etcdctl
-  - etcdutl
-
-# Files to include in the package
-contents:
-  - src: /app/etcd
-    dst: /usr/bin/etcd
-    file_info:
-      mode: 0755
-      owner: root
-      group: root
-  - src: /app/etcdctl
-    dst: /usr/bin/etcdctl
-    file_info:
-      mode: 0755
-      owner: root
-      group: root
-  - src: /app/etcdutl
-    dst: /usr/bin/etcdutl
-    file_info:
-      mode: 0755
-      owner: root
-      group: root
-  - src: /app/resources/etcd.service
-    dst: /usr/lib/systemd/system/etcd.service
-    file_info:
-      mode: 0644
-      owner: root
-      group: root
-
-# Scripts to run during installation/removal (optional)
-scripts:
-  preinstall: ./resources/scripts/preinstall.sh
-  postinstall: ./resources/scripts/postinstall.sh
-  preremove: ./resources/scripts/preremove.sh
-  postremove: ./resources/scripts/postremove.sh

rpms/etcd/resources/etcd.service

@@ -1,18 +0,0 @@
-[Unit]
-Description=etcd key-value store
-Documentation=https://github.com/etcd-io/etcd
-After=network-online.target local-fs.target remote-fs.target time-sync.target
-Wants=network-online.target local-fs.target remote-fs.target time-sync.target
-
-[Service]
-User=etcd
-Type=notify
-Environment=ETCD_DATA_DIR=/var/lib/etcd
-Environment=ETCD_NAME=%m
-ExecStart=/usr/bin/etcd
-Restart=always
-RestartSec=10s
-LimitNOFILE=40000
-
-[Install]
-WantedBy=multi-user.target

rpms/etcd/resources/scripts/postinstall.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-systemctl daemon-reload

rpms/etcd/resources/scripts/postremove.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-rm -f /usr/lib/systemd/system/etcd.service
-systemctl daemon-reload

rpms/etcd/resources/scripts/preinstall.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-groupadd --system etcd
-useradd --system --shell /sbin/nologin --no-create-home --home-dir /var/lib/etcd --gid etcd etcd
-mkdir -p /var/lib/etcd
-chown etcd:etcd /var/lib/etcd

rpms/etcd/resources/scripts/preremove.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-systemctl stop etcd.service

rpms/nfpm/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/nomad/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/packer/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/ruff/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/terraform/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/terragrunt/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/uv/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist

rpms/vault/Dockerfile

@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist