Skip to content

Commit

Permalink
ci: build mri-3.2 image with modern valgrind (#2910)
Browse files Browse the repository at this point in the history
**What problem is this PR intended to solve?**

Build mri-3.2 image with modern valgrind from source. Otherwise we run
into DWARF5 format issues.

Closes #2909
  • Loading branch information
flavorjones authored Jun 22, 2023
2 parents c350a2f + 393eb1c commit a2c0073
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
10 changes: 8 additions & 2 deletions oci-images/nokogiri-test/mri-3.2.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions oci-images/nokogiri-test/mri.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>
Expand Down
9 changes: 9 additions & 0 deletions oci-images/nokogiri-test/valgrind-from-source.step
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit a2c0073

Please sign in to comment.