From cbf2c21a0da11a43692a8ae8c40daa8d26a37b89 Mon Sep 17 00:00:00 2001
From: Petar Shtuchkin <petar.shtuchkin@redis.com>
Date: Mon, 13 Jul 2026 19:27:01 +0300
Subject: [PATCH] Install yq only when build is custom

---
 alpine/Dockerfile    | 1 -
 alpine/Dockerfile.j2 | 4 +++-
 debian/Dockerfile    | 1 -
 debian/Dockerfile.j2 | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 002c89608..bf0f63b7b 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -50,7 +50,6 @@ RUN set -eux; \
 		g++ \
 		git \
 		libffi-dev \
-		yq-go \
 		libgcc \
 		libtool \
 		llvm21-dev \
diff --git a/alpine/Dockerfile.j2 b/alpine/Dockerfile.j2
index 6277d52a7..760697a7d 100644
--- a/alpine/Dockerfile.j2
+++ b/alpine/Dockerfile.j2
@@ -47,6 +47,9 @@ RUN set -eux; \
 	esac; \
 	if [ "$BUILD_WITH_MODULES" = "yes" ]; then \
 	apk add --no-cache --virtual .module-build-deps \
+		{% if custom_build %}
+		yq-go \
+		{% endif %}
 		autoconf \
 		automake \
 		bash \
@@ -61,7 +64,6 @@ RUN set -eux; \
 		g++ \
 		git \
 		libffi-dev \
-		yq-go \
 		libgcc \
 		libtool \
 		llvm21-dev \
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 80cbf5edf..0fed31dcc 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -44,7 +44,6 @@ RUN set -eux; \
 		apt-get update; \
 		apt-get install -y --no-install-recommends \
 			git \
-			yq \
 			cmake \
 			python3 \
 			python3-pip \
diff --git a/debian/Dockerfile.j2 b/debian/Dockerfile.j2
index f57e11482..f42f8470c 100644
--- a/debian/Dockerfile.j2
+++ b/debian/Dockerfile.j2
@@ -53,8 +53,10 @@ RUN set -eux; \
 		echo 'deb http://deb.debian.org/debian trixie-backports main' > /etc/apt/sources.list.d/backports.list; \
 		apt-get update; \
 		apt-get install -y --no-install-recommends \
-			git \
+			{% if custom_build %}
 			yq \
+			{% endif %}
+			git \
 			cmake \
 			python3 \
 			python3-pip \