From 605897a233f083a5a3de27dba2e74ba7b6c36bba Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Tue, 4 Mar 2025 17:30:55 -0600
Subject: [PATCH] Fix validator build (#183)

---
 validator/Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/validator/Dockerfile b/validator/Dockerfile
index b4fd168..9c54671 100644
--- a/validator/Dockerfile
+++ b/validator/Dockerfile
@@ -22,14 +22,17 @@ COPY --from=build /otel_config_validator /otel_config_validator
 
 ENTRYPOINT ["/otel_config_validator"]
 
-FROM ubuntu:22.04 AS shelltest
+FROM ubuntu:24.04 AS shelltest
+
+ENV YQ_VERSION="v4.45.1"
 
 RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update \
-    && apt-get install -y software-properties-common \
-    && apt-add-repository ppa:rmescandon/yq \
+    && apt-get install -y software-properties-common wget \
+    && wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 \
+        && chmod +x /usr/local/bin/yq \
     && apt-get update \
-    && apt-get install -y shelltestrunner jq yq make \
+    && apt-get install -y shelltestrunner jq make \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /root/validator