From 1709c34a38ca7f9612d41d040c72fb927e6b59c4 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 12 Jul 2025 19:03:14 +1000 Subject: [PATCH] chore: fixed naming of vm* packages - the build job searches for the package in dnf cache, but because it was three packages in victoriametrics, it would never find the package and therfore would rebuild the package every run --- rpms/victoriametrics/resources/build.sh | 4 ---- .../1.119.0/release | 0 rpms/{victoriametrics => vminsert}/Dockerfile | 0 rpms/vminsert/resources/build.sh | 2 ++ .../resources/nfpm.yaml} | 0 rpms/vmselect/1.119.0/release | 1 + rpms/vmselect/Dockerfile | 23 +++++++++++++++++++ rpms/vmselect/resources/build.sh | 2 ++ .../resources/nfpm.yaml} | 0 rpms/vmstorage/1.119.0/release | 1 + rpms/vmstorage/Dockerfile | 23 +++++++++++++++++++ rpms/vmstorage/resources/build.sh | 2 ++ .../resources/nfpm.yaml} | 0 13 files changed, 54 insertions(+), 4 deletions(-) delete mode 100755 rpms/victoriametrics/resources/build.sh rename rpms/{victoriametrics => vminsert}/1.119.0/release (100%) rename rpms/{victoriametrics => vminsert}/Dockerfile (100%) create mode 100755 rpms/vminsert/resources/build.sh rename rpms/{victoriametrics/resources/vminsert.yaml => vminsert/resources/nfpm.yaml} (100%) create mode 100644 rpms/vmselect/1.119.0/release create mode 100644 rpms/vmselect/Dockerfile create mode 100755 rpms/vmselect/resources/build.sh rename rpms/{victoriametrics/resources/vmselect.yaml => vmselect/resources/nfpm.yaml} (100%) create mode 100644 rpms/vmstorage/1.119.0/release create mode 100644 rpms/vmstorage/Dockerfile create mode 100755 rpms/vmstorage/resources/build.sh rename rpms/{victoriametrics/resources/vmstorage.yaml => vmstorage/resources/nfpm.yaml} (100%) diff --git a/rpms/victoriametrics/resources/build.sh b/rpms/victoriametrics/resources/build.sh deleted file mode 100755 index 0386f7b..0000000 --- a/rpms/victoriametrics/resources/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/bash -nfpm pkg --config /app/resources/vminsert.yaml --target /app/dist --packager rpm -nfpm pkg --config /app/resources/vmselect.yaml --target /app/dist --packager rpm -nfpm pkg --config /app/resources/vmstorage.yaml --target /app/dist --packager rpm diff --git a/rpms/victoriametrics/1.119.0/release b/rpms/vminsert/1.119.0/release similarity index 100% rename from rpms/victoriametrics/1.119.0/release rename to rpms/vminsert/1.119.0/release diff --git a/rpms/victoriametrics/Dockerfile b/rpms/vminsert/Dockerfile similarity index 100% rename from rpms/victoriametrics/Dockerfile rename to rpms/vminsert/Dockerfile diff --git a/rpms/vminsert/resources/build.sh b/rpms/vminsert/resources/build.sh new file mode 100755 index 0000000..ae730e3 --- /dev/null +++ b/rpms/vminsert/resources/build.sh @@ -0,0 +1,2 @@ +#!/usr/bin/bash +nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/victoriametrics/resources/vminsert.yaml b/rpms/vminsert/resources/nfpm.yaml similarity index 100% rename from rpms/victoriametrics/resources/vminsert.yaml rename to rpms/vminsert/resources/nfpm.yaml diff --git a/rpms/vmselect/1.119.0/release b/rpms/vmselect/1.119.0/release new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/rpms/vmselect/1.119.0/release @@ -0,0 +1 @@ +1 diff --git a/rpms/vmselect/Dockerfile b/rpms/vmselect/Dockerfile new file mode 100644 index 0000000..bc58b69 --- /dev/null +++ b/rpms/vmselect/Dockerfile @@ -0,0 +1,23 @@ +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest + +# Create output directory for RPMs +RUN mkdir -p /app/dist + +# Set working directory +WORKDIR /app + +ARG PACKAGE_RELEASE +ENV PACKAGE_RELEASE=${PACKAGE_RELEASE} +ARG PACKAGE_VERSION +ENV PACKAGE_VERSION=${PACKAGE_VERSION} + +# Copy nfpm.yaml from the context into the container +COPY resources /app/resources + +# Download the required files +RUN wget -O /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz \ + https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz && \ + tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz + +# Default command to build RPMs +CMD /app/resources/build.sh diff --git a/rpms/vmselect/resources/build.sh b/rpms/vmselect/resources/build.sh new file mode 100755 index 0000000..ae730e3 --- /dev/null +++ b/rpms/vmselect/resources/build.sh @@ -0,0 +1,2 @@ +#!/usr/bin/bash +nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/victoriametrics/resources/vmselect.yaml b/rpms/vmselect/resources/nfpm.yaml similarity index 100% rename from rpms/victoriametrics/resources/vmselect.yaml rename to rpms/vmselect/resources/nfpm.yaml diff --git a/rpms/vmstorage/1.119.0/release b/rpms/vmstorage/1.119.0/release new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/rpms/vmstorage/1.119.0/release @@ -0,0 +1 @@ +1 diff --git a/rpms/vmstorage/Dockerfile b/rpms/vmstorage/Dockerfile new file mode 100644 index 0000000..bc58b69 --- /dev/null +++ b/rpms/vmstorage/Dockerfile @@ -0,0 +1,23 @@ +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest + +# Create output directory for RPMs +RUN mkdir -p /app/dist + +# Set working directory +WORKDIR /app + +ARG PACKAGE_RELEASE +ENV PACKAGE_RELEASE=${PACKAGE_RELEASE} +ARG PACKAGE_VERSION +ENV PACKAGE_VERSION=${PACKAGE_VERSION} + +# Copy nfpm.yaml from the context into the container +COPY resources /app/resources + +# Download the required files +RUN wget -O /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz \ + https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz && \ + tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz + +# Default command to build RPMs +CMD /app/resources/build.sh diff --git a/rpms/vmstorage/resources/build.sh b/rpms/vmstorage/resources/build.sh new file mode 100755 index 0000000..ae730e3 --- /dev/null +++ b/rpms/vmstorage/resources/build.sh @@ -0,0 +1,2 @@ +#!/usr/bin/bash +nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/victoriametrics/resources/vmstorage.yaml b/rpms/vmstorage/resources/nfpm.yaml similarity index 100% rename from rpms/victoriametrics/resources/vmstorage.yaml rename to rpms/vmstorage/resources/nfpm.yaml