From 3b3229af0fbdb986bd0945d3a8791df167badc01 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Mon, 25 Aug 2025 09:38:50 -0500 Subject: [PATCH 1/2] Add gzip to support compressing arbitrary strings --- Containerfile | 2 +- Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 6e65207..68a775b 100644 --- a/Containerfile +++ b/Containerfile @@ -60,7 +60,7 @@ RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERS # Add requirements.yml file for ansible collections COPY requirements.yml /tmp/requirements.yml -RUN microdnf --disableplugin=subscription-manager install -y make git-core tar vi jq which findutils diffutils sshpass $EXTRARPMS && \ +RUN microdnf --disableplugin=subscription-manager install -y make git-core tar vi jq which findutils diffutils sshpass gzip $EXTRARPMS && \ microdnf remove -y $DNF_TO_REMOVE && \ rpm -e --nodeps $RPM_TO_FORCEFULLY_REMOVE && \ microdnf clean all && \ diff --git a/Makefile b/Makefile index eecf008..1f2a434 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,7 @@ versions: ## Print all the versions of software in the locally-built container echo -n \"|git-core package \"; rpm -q --qf '%{VERSION}' git-core; echo \" \"; \ echo -n \"|vi package \"; rpm -q --qf '%{VERSION}' vim-minimal; echo \" \"; \ echo -n \"|tar package \"; rpm -q --qf '%{VERSION}' tar; echo \" \"; \ + echo -n \"|gzip package \"; rpm -q --qf '%{VERSION}' gzip; echo \" \"; \ echo -n \"|make package \"; rpm -q --qf '%{VERSION}' make; echo \" \"; \ echo -n \"|python package \"; /usr/bin/python3 --version | sed -e s'/Python //' | tr -d '\n'; echo \" \"; \ echo -n \"|jq package \"; rpm -q --qf '%{VERSION}' jq; echo \" \"; \ From 9536aac01d840283acd7f8d46a63aab563f24c02 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Mon, 25 Aug 2025 09:44:33 -0500 Subject: [PATCH 2/2] Add gzip to test command too --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 1f2a434..dc2a5cd 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ TESTCOMMAND := "set -e; echo '* Helm: '; helm version; \ echo '* rhvp.cluster_utils: '; ansible-galaxy collection list | grep rhvp.cluster_utils ; \ echo '* diff: '; diff --version ; \ echo '* find: '; find --version ; \ + echo '* gzip: '; gzip --version ; \ echo '* tea: '; tea --version" ; ##@ Help-related tasks