From 729218788d225628511fbdbfe31df9f51c41d02b Mon Sep 17 00:00:00 2001 From: Ivan Garcia Date: Thu, 2 Apr 2026 17:32:46 -0400 Subject: [PATCH 1/4] Update makefile --- .github/workflows/rpm-build.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml index c8a2e3c..39dde63 100644 --- a/.github/workflows/rpm-build.yml +++ b/.github/workflows/rpm-build.yml @@ -19,7 +19,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Creating mock gpg directory + - name: Creating gpg directory run: mkdir -p ~/.gnupg - name: Pull Container Images diff --git a/Makefile b/Makefile index 8b93d59..e677365 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION ?= 10 PACKAGE = prometheus3 -REGISTRY = ghcr.io/cloudox-org/cloudox-rpm-builder-test-alma +REGISTRY = ghcr.io/cloudox-org/cloudox-rpm-builder-alma IMAGE = ${REGISTRY}:${VERSION} OUT_DIR = el${VERSION} @@ -32,4 +32,4 @@ clean: @echo "[*] Cleaning up build artifacts..." @rm -rf el8 el9 el10 @rm -f *.tar.gz - @echo "[*] Cleanup complete." + eecho "[*] Cleanup complete." From 9169e2fd101cfc644bc9b687b7ba2914ea4222d3 Mon Sep 17 00:00:00 2001 From: Ivan Garcia Date: Thu, 2 Apr 2026 17:34:51 -0400 Subject: [PATCH 2/4] Update makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e677365..1f41220 100644 --- a/Makefile +++ b/Makefile @@ -32,4 +32,4 @@ clean: @echo "[*] Cleaning up build artifacts..." @rm -rf el8 el9 el10 @rm -f *.tar.gz - eecho "[*] Cleanup complete." + @echo "[*] Cleanup complete." From 8887619006f34552e705885b665271dd3e655b80 Mon Sep 17 00:00:00 2001 From: Ivan Garcia Date: Thu, 2 Apr 2026 17:39:28 -0400 Subject: [PATCH 3/4] Update makefile --- .github/workflows/rpm-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml index 39dde63..70694a8 100644 --- a/.github/workflows/rpm-build.yml +++ b/.github/workflows/rpm-build.yml @@ -25,9 +25,9 @@ jobs: - name: Pull Container Images run: | sudo ln -sf /usr/bin/podman /usr/bin/docker - podman pull ghcr.io/cloudox-org/cloudox-rpm-builder-test-alma:8 - podman pull ghcr.io/cloudox-org/cloudox-rpm-builder-test-alma:9 - podman pull ghcr.io/cloudox-org/cloudox-rpm-builder-test-alma:10 + podman pull ghcr.io/cloudox-org/cloudox-rpm-builder:8 + podman pull ghcr.io/cloudox-org/cloudox-rpm-builder:9 + podman pull ghcr.io/cloudox-org/cloudox-rpm-builder:10 - name: Building RPMS run: make all From 2d554ed8832f54b1f63b1a997a2a464f5736103d Mon Sep 17 00:00:00 2001 From: Ivan Garcia Date: Thu, 2 Apr 2026 17:43:36 -0400 Subject: [PATCH 4/4] Update makefile --- .github/workflows/rpm-build.yml | 9 ++------- Makefile | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml index 70694a8..535ebc1 100644 --- a/.github/workflows/rpm-build.yml +++ b/.github/workflows/rpm-build.yml @@ -22,12 +22,7 @@ jobs: - name: Creating gpg directory run: mkdir -p ~/.gnupg - - name: Pull Container Images + - name: Building RPMS run: | sudo ln -sf /usr/bin/podman /usr/bin/docker - podman pull ghcr.io/cloudox-org/cloudox-rpm-builder:8 - podman pull ghcr.io/cloudox-org/cloudox-rpm-builder:9 - podman pull ghcr.io/cloudox-org/cloudox-rpm-builder:10 - - - name: Building RPMS - run: make all + make all diff --git a/Makefile b/Makefile index 1f41220..82abc7e 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ .PHONY: all build clean -VERSION ?= 10 PACKAGE = prometheus3 -REGISTRY = ghcr.io/cloudox-org/cloudox-rpm-builder-alma -IMAGE = ${REGISTRY}:${VERSION} +IMAGE = ghcr.io/cloudox-org/cloudox-rpm-builder-alma:${VERSION} OUT_DIR = el${VERSION} all: