From 6872fbfa7c0ea4e96b3765ef4661eaadb9d3db96 Mon Sep 17 00:00:00 2001
From: Mauro Ezequiel Moltrasio <mmoltras@redhat.com>
Date: Mon, 4 Nov 2024 10:58:52 +0100
Subject: [PATCH] Stop installing jq to the builder image (#1925)

---
 builder/install/50-jq.sh               | 16 ----------------
 builder/install/versions.sh            |  1 -
 collector/container/konflux.Dockerfile |  2 --
 3 files changed, 19 deletions(-)
 delete mode 100755 builder/install/50-jq.sh

diff --git a/builder/install/50-jq.sh b/builder/install/50-jq.sh
deleted file mode 100755
index b5b27f46e8..0000000000
--- a/builder/install/50-jq.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ -n "${WITH_RHEL_RPMS}" ]; then
-    # Already installed as an RPM, nothing more to do.
-    exit 0
-fi
-
-wget "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-${JQ_VERSION}.tar.gz"
-tar -zxf "jq-${JQ_VERSION}.tar.gz"
-cd "jq-${JQ_VERSION}"
-cp COPYING "${LICENSE_DIR}/jq-${JQ_VERSION}"
-./configure --without-oniguruma --disable-maintainer-mode --enable-all-static --disable-dependency-tracking --prefix=/usr/local
-make ${NPROCS:+-j ${NPROCS}} LDFLAGS=-all-static CFLAGS=-fPIC
-make install
diff --git a/builder/install/versions.sh b/builder/install/versions.sh
index dc120b8110..2d13d2d0e3 100644
--- a/builder/install/versions.sh
+++ b/builder/install/versions.sh
@@ -4,7 +4,6 @@ export B64_VERSION=1.2.1
 export CARES_VERSION=1.34.2
 export GOOGLETEST_REVISION=release-1.10.0
 export GRPC_REVISION=v1.67.0
-export JQ_VERSION=1.6
 export JSONCPP_REVISION=0.10.7
 export PROMETHEUS_CPP_REVISION=v0.9.0
 export PROTOBUF_VERSION=v28.3
diff --git a/collector/container/konflux.Dockerfile b/collector/container/konflux.Dockerfile
index f7a1022347..a1bb42bf0a 100644
--- a/collector/container/konflux.Dockerfile
+++ b/collector/container/konflux.Dockerfile
@@ -32,7 +32,6 @@ RUN /tmp/.konflux/scripts/subscription-manager-bro.sh register /mnt && \
         git \
         elfutils-libelf-devel \
         tbb-devel \
-        jq-devel \
         c-ares-devel \
         patch \
         # for USDT support
@@ -108,7 +107,6 @@ RUN /tmp/.konflux/scripts/subscription-manager-bro.sh register /mnt && \
     dnf -y --installroot=/mnt upgrade --nobest && \
     dnf -y --installroot=/mnt install --nobest \
       tbb \
-      jq \
       c-ares && \
     /tmp/.konflux/scripts/subscription-manager-bro.sh cleanup && \
     # We can do usual cleanup while we're here: remove packages that would trigger violations. \