- add nfpm package - prepare for golang builds - cleanup layers in docker
This commit is contained in:
parent
e0fee84e65
commit
760b67b9e8
13
Dockerfile
13
Dockerfile
@ -1,17 +1,18 @@
|
||||
# Start with the AlmaLinux 8.10 base image
|
||||
FROM git.query.consul/unkin/almalinux8:latest
|
||||
|
||||
# Clean and update the repository cache
|
||||
RUN dnf clean all && \
|
||||
dnf makecache
|
||||
|
||||
# Install nodejs:20 for actions
|
||||
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
|
||||
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
|
||||
|
||||
# Cleanup
|
||||
RUN dnf clean all && \
|
||||
|
||||
8
Makefile
8
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)
|
||||
|
||||
@ -11,7 +14,10 @@ OWNER := unkin
|
||||
|
||||
# Build the Docker image (without tags)
|
||||
build:
|
||||
docker build --network=host -t $(REGISTRY)/$(OWNER)/$(IMAGE_NAME) .
|
||||
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'
|
||||
tag:
|
||||
|
||||
Reference in New Issue
Block a user