From 393eb1caccda870955a077a8ba6ed56f3685046b Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Thu, 22 Jun 2023 10:00:45 -0400
Subject: [PATCH] ci: build mri-3.2 image with modern valgrind

otherwise we run into DWARF5 format issues.

Closes #2909
---
 oci-images/nokogiri-test/mri-3.2.dockerfile        | 10 ++++++++--
 oci-images/nokogiri-test/mri.erb                   |  4 ++++
 oci-images/nokogiri-test/valgrind-from-source.step |  9 +++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 oci-images/nokogiri-test/valgrind-from-source.step

diff --git a/oci-images/nokogiri-test/mri-3.2.dockerfile b/oci-images/nokogiri-test/mri-3.2.dockerfile
index a7c0361355..fed403b418 100644
--- a/oci-images/nokogiri-test/mri-3.2.dockerfile
+++ b/oci-images/nokogiri-test/mri-3.2.dockerfile
@@ -9,10 +9,16 @@ RUN apt-get upgrade -y
 RUN apt-get install -y apt-utils
 
 
-# include_file debian-valgrind.step
+# include_file valgrind-from-source.step
 # -*- dockerfile -*-
 
-RUN apt-get install -y valgrind
+RUN apt-get install -y libc6-dbg
+RUN wget https://sourceware.org/pub/valgrind/valgrind-3.21.0.tar.bz2 && \
+    tar -xf valgrind-3.21.0.tar.bz2 && \
+    cd valgrind-3.21.0 && \
+    ./configure && \
+    make && \
+    make install
 
 
 # include_file debian-libxml-et-al.step
diff --git a/oci-images/nokogiri-test/mri.erb b/oci-images/nokogiri-test/mri.erb
index e50a4fd3a5..553666be3d 100644
--- a/oci-images/nokogiri-test/mri.erb
+++ b/oci-images/nokogiri-test/mri.erb
@@ -2,7 +2,11 @@ FROM ruby:<%= version %>
 
 <%= include_file "debian-prelude.step" %>
 
+<% if version == "3.2" -%>
+<%= include_file "valgrind-from-source.step" %>
+<% else -%>
 <%= include_file "debian-valgrind.step" %>
+<% end -%>
 
 <%= include_file "debian-libxml-et-al.step" %>
 
diff --git a/oci-images/nokogiri-test/valgrind-from-source.step b/oci-images/nokogiri-test/valgrind-from-source.step
new file mode 100644
index 0000000000..6c9637d7f9
--- /dev/null
+++ b/oci-images/nokogiri-test/valgrind-from-source.step
@@ -0,0 +1,9 @@
+# -*- dockerfile -*-
+
+RUN apt-get install -y libc6-dbg
+RUN wget https://sourceware.org/pub/valgrind/valgrind-3.21.0.tar.bz2 && \
+    tar -xf valgrind-3.21.0.tar.bz2 && \
+    cd valgrind-3.21.0 && \
+    ./configure && \
+    make && \
+    make install