From 100c38f8f5f57461c842c6fa340e5b318e44cfc4 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sat, 30 Nov 2024 23:53:02 +1100
Subject: [PATCH] feat: change to buildrunner

- cleaned up multiple layers
---
 Makefile                   |  2 --
 rpms/terragrunt/Dockerfile | 15 +--------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 335c460..18fe99c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # Variables
 ROOT_DIR := $(PWD)
 RPMS_DIR := $(ROOT_DIR)/rpms
-NFPM_VERSION := 2.41.1
 
 # Automatically find all package/version directories
 PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||")
@@ -29,7 +28,6 @@ build:
 		export PACKAGE_RELEASE=$$(cat $(PACKAGE_VERSION)/release) && \
 		echo "Using PACKAGE_RELEASE=$${PACKAGE_RELEASE}" && \
 		docker build \
-			--build-arg NFPM_VERSION=$(NFPM_VERSION) \
 			--build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \
 			--build-arg PACKAGE_RELEASE=$${PACKAGE_RELEASE} \
 			-t $$(echo $(PACKAGE_NAME)-builder \
diff --git a/rpms/terragrunt/Dockerfile b/rpms/terragrunt/Dockerfile
index b7593af..df049c7 100644
--- a/rpms/terragrunt/Dockerfile
+++ b/rpms/terragrunt/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8:latest
+FROM git.query.consul/unkin/almalinux8-buildagent:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
@@ -11,19 +11,6 @@ ARG PACKAGE_RELEASE
 ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
 ARG PACKAGE_VERSION
 ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-ARG NFPM_VERSION
-ENV NFPM_VERSION=${NFPM_VERSION}
-
-# Clean and update the repository cache
-RUN dnf clean all && \
-    dnf makecache
-
-# Install build tools and dependencies for building RPMs
-RUN dnf groupinstall -y 'Development Tools' && \
-    dnf install -y make cmake gcc gcc-c++ rpm rpmdevtools wget tar gzip
-
-# Install nfpm using the RPM package
-RUN dnf install -y https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm-${NFPM_VERSION}-1.x86_64.rpm
 
 # Copy nfpm.yaml from the context into the container
 COPY nfpm.yaml /app/nfpm.yaml