Compare commits
No commits in common. "2d883f6c31b3354752b7918c15d60cba2764b58c" and "e0fee84e6501d28133e90d6df2e4c9ca49834e01" have entirely different histories.
2d883f6c31
...
e0fee84e65
13
Dockerfile
13
Dockerfile
@ -1,18 +1,17 @@
|
|||||||
# 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:latest
|
||||||
|
|
||||||
|
# Clean and update the repository cache
|
||||||
|
RUN dnf clean all && \
|
||||||
|
dnf makecache
|
||||||
|
|
||||||
# Install nodejs:20 for actions
|
# Install nodejs:20 for actions
|
||||||
RUN dnf module enable -y nodejs:20 && \
|
RUN dnf module enable -y nodejs:20 && \
|
||||||
dnf install -y nodejs
|
dnf install -y nodejs
|
||||||
|
|
||||||
# Install build tools and dependencies for building RPMs
|
# Install build-essential
|
||||||
RUN dnf groupinstall -y 'Development Tools' && \
|
RUN dnf groupinstall -y 'Development Tools' && \
|
||||||
dnf install -y make cmake gcc gcc-c++ rpm rpmdevtools wget tar gzip go
|
dnf install -y make cmake gcc gcc-c++ rpm rpmdevtools wget
|
||||||
|
|
||||||
# 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
|
# Cleanup
|
||||||
RUN dnf clean all && \
|
RUN dnf clean all && \
|
||||||
|
|||||||
8
Makefile
8
Makefile
@ -1,6 +1,3 @@
|
|||||||
# Set the nfpm version to install
|
|
||||||
NFPM_VERSION := 2.41.1
|
|
||||||
|
|
||||||
# Get the current Git commit hash
|
# Get the current Git commit hash
|
||||||
GIT_COMMIT := $(shell git rev-parse --short HEAD)
|
GIT_COMMIT := $(shell git rev-parse --short HEAD)
|
||||||
|
|
||||||
@ -14,10 +11,7 @@ OWNER := unkin
|
|||||||
|
|
||||||
# Build the Docker image (without tags)
|
# Build the Docker image (without tags)
|
||||||
build:
|
build:
|
||||||
docker build \
|
docker build --network=host -t $(REGISTRY)/$(OWNER)/$(IMAGE_NAME) .
|
||||||
--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 the Docker image with the Git commit hash, the date, and 'latest'
|
||||||
tag:
|
tag:
|
||||||
|
|||||||
Reference in New Issue
Block a user