Merge pull request 'feat: change to nfpm from rpms' (#4) from neoloc/nfpm_package into master
All checks were successful
Deploy / build (push) Successful in 8s

Reviewed-on: https://git.query.consul/unkin/docker-almalinux-buildrunner/pulls/4
This commit is contained in:
Ben Vincent 2024-12-02 22:22:19 +11:00
commit 146b4d2808
2 changed files with 4 additions and 11 deletions

View File

@ -6,13 +6,10 @@ RUN dnf module enable -y nodejs:20 && \
dnf install -y nodejs
# 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 go
# Install nfpm using the RPM package
ARG NFPM_VERSION
ENV NFPM_VERSION=${NFPM_VERSION}
RUN dnf install -y https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm-${NFPM_VERSION}-1.x86_64.rpm
RUN dnf clean all && \
dnf makecache && \
dnf groupinstall -y 'Development Tools' && \
dnf install -y make cmake gcc gcc-c++ rpm rpmdevtools wget tar gzip go nfpm
# Cleanup
RUN dnf clean all && \

View File

@ -1,6 +1,3 @@
# 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)
@ -16,7 +13,6 @@ OWNER := unkin
build:
docker build \
--network=host \
--build-arg NFPM_VERSION=$(NFPM_VERSION) \
-t $(REGISTRY)/$(OWNER)/$(IMAGE_NAME) .
# Tag the Docker image with the Git commit hash, the date, and 'latest'