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

feat: change to buildrunner
Some checks failed
Build / build (pull_request) Failing after 1m3s
Details

Browse Source 
- cleaned up multiple layers
This commit is contained in:
Ben Vincent 2024-11-30 23:53:02 +11:00
parent 346861ff9a
commit 100c38f8f5
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,6 @@
# Variables # Variables
ROOT_DIR := $(PWD) ROOT_DIR := $(PWD)
RPMS_DIR := $(ROOT_DIR)/rpms RPMS_DIR := $(ROOT_DIR)/rpms
NFPM_VERSION := 2.41.1
# Automatically find all package/version directories # Automatically find all package/version directories
PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||") 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) && \ export PACKAGE_RELEASE=$$(cat $(PACKAGE_VERSION)/release) && \
echo "Using PACKAGE_RELEASE=$${PACKAGE_RELEASE}" && \ echo "Using PACKAGE_RELEASE=$${PACKAGE_RELEASE}" && \
docker build \ docker build \
--build-arg NFPM_VERSION=$(NFPM_VERSION) \
--build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \ --build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \
--build-arg PACKAGE_RELEASE=$${PACKAGE_RELEASE} \ --build-arg PACKAGE_RELEASE=$${PACKAGE_RELEASE} \
-t $$(echo $(PACKAGE_NAME)-builder \ -t $$(echo $(PACKAGE_NAME)-builder \

15
rpms/terragrunt/Dockerfile
View File

@ -1,5 +1,5 @@
# Start with the AlmaLinux 8.10 base image # 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 # Create output directory for RPMs
RUN mkdir -p /app/dist RUN mkdir -p /app/dist
@ -11,19 +11,6 @@ ARG PACKAGE_RELEASE
ENV PACKAGE_RELEASE=${PACKAGE_RELEASE} ENV PACKAGE_RELEASE=${PACKAGE_RELEASE}
ARG PACKAGE_VERSION ARG PACKAGE_VERSION
ENV PACKAGE_VERSION=${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 from the context into the container
COPY nfpm.yaml /app/nfpm.yaml COPY nfpm.yaml /app/nfpm.yaml