From 1de8a88b9bb9f889814d303c3afbda4060f616ff Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 30 Nov 2024 23:34:31 +1100 Subject: [PATCH] feat: add nfpm/go to buildrunner --- Dockerfile | 8 ++++++-- Makefile | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d637c7..4aa1635 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,13 @@ RUN dnf clean all && \ RUN dnf module enable -y nodejs:20 && \ dnf install -y nodejs -# Install build-essential +# 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 + dnf install -y make cmake gcc gcc-c++ rpm rpmdevtools wget tar gzip go + +# 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 + # Cleanup RUN dnf clean all && \ diff --git a/Makefile b/Makefile index 5ffa99e..e294fd2 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# Set the nfpm version to install +NFPM_VERSION := 2.41.1 + # Get the current Git commit hash GIT_COMMIT := $(shell git rev-parse --short HEAD)