code_public/logcorrelator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use version from .spec file for RPM builds

Browse Source 
- Extract version dynamically from packaging/rpm/logcorrelator.spec
- Apply to both Dockerfile and Dockerfile.package
- Ensures RPM packages always use the correct version from spec file

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
Jacquin Antoine
2026-03-01 00:19:14 +01:00
parent 87b94f3c18
commit 9bb6ae3106
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -94,7 +94,7 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
chmod 755 /tmp/pkgroot/var/run/logcorrelator
# Build RPM
ARG VERSION=1.0.0
ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}')
RUN fpm -s dir -t rpm \
-n logcorrelator \
-v ${VERSION} \

8
Dockerfile.package
View File

@ -23,7 +23,7 @@ RUN go mod download
COPY . .
# Build binary for Linux
ARG VERSION=1.0.2
ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}')
RUN mkdir -p dist && \
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
go build -ldflags="-w -s -X main.Version=${VERSION}" \
@ -67,7 +67,7 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
chmod 755 /tmp/pkgroot/var/run/logcorrelator
# Build RPM for Rocky Linux 8
ARG VERSION=1.0.2
ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}')
RUN mkdir -p /packages/rpm/rocky8 && \
fpm -s dir -t rpm \
-n logcorrelator \
@ -130,7 +130,7 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
chmod 755 /tmp/pkgroot/var/run/logcorrelator
# Build RPM for Rocky Linux 9
ARG VERSION=1.0.2
ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}')
RUN mkdir -p /packages/rpm/rocky9 && \
fpm -s dir -t rpm \
-n logcorrelator \
@ -193,7 +193,7 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
chmod 755 /tmp/pkgroot/var/run/logcorrelator
# Build RPM for AlmaLinux 10
ARG VERSION=1.0.2
ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}')
RUN mkdir -p /packages/rpm/almalinux10 && \
fpm -s dir -t rpm \
-n logcorrelator \