diff --git a/Dockerfile b/Dockerfile index ba7fa7f..3b05d18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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} \ diff --git a/Dockerfile.package b/Dockerfile.package index 25e3099..ecfe6f1 100644 --- a/Dockerfile.package +++ b/Dockerfile.package @@ -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 \