From 880e94cf359b319704da86c5b24b3794355f693f Mon Sep 17 00:00:00 2001
From: Loic Nageleisen <loic.nageleisen@datadoghq.com>
Date: Wed, 27 Nov 2024 14:33:29 +0100
Subject: [PATCH] Add missing tools to CentOS

These tools are largely expected to be present by build systems
---
 src/engines/ruby/1.8/Dockerfile.centos | 4 ++--
 src/engines/ruby/1.9/Dockerfile.centos | 2 +-
 src/engines/ruby/2.0/Dockerfile.centos | 2 +-
 src/engines/ruby/2.1/Dockerfile.centos | 2 +-
 src/engines/ruby/2.2/Dockerfile.centos | 2 +-
 src/engines/ruby/2.3/Dockerfile.centos | 2 +-
 src/engines/ruby/2.4/Dockerfile.centos | 2 +-
 src/engines/ruby/2.5/Dockerfile.centos | 2 +-
 src/engines/ruby/2.6/Dockerfile.centos | 2 +-
 src/engines/ruby/2.7/Dockerfile.centos | 2 +-
 src/engines/ruby/3.0/Dockerfile.centos | 2 +-
 src/engines/ruby/3.1/Dockerfile.centos | 2 +-
 src/engines/ruby/3.2/Dockerfile.centos | 2 +-
 src/engines/ruby/3.3/Dockerfile.centos | 2 +-
 src/engines/ruby/3.4/Dockerfile.centos | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/engines/ruby/1.8/Dockerfile.centos b/src/engines/ruby/1.8/Dockerfile.centos
index 05a3ce7..675dc90 100644
--- a/src/engines/ruby/1.8/Dockerfile.centos
+++ b/src/engines/ruby/1.8/Dockerfile.centos
@@ -70,7 +70,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
@@ -96,7 +96,7 @@ ENV LANG="en_US.UTF-8"
 RUN <<SHELL
 set -euxo pipefail
 
-yum install -y xz gcc automake bison zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel patch
+yum install -y xz gcc automake bison zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel
 
 curl -L -o ruby.tar.gz "https://github.com/ruby/ruby/archive/f48ae0d10c5b586db5748b0d4b645c7e9ff5d52e.tar.gz"
 echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | sha256sum --check --strict
diff --git a/src/engines/ruby/1.9/Dockerfile.centos b/src/engines/ruby/1.9/Dockerfile.centos
index 38ac302..c3aea13 100644
--- a/src/engines/ruby/1.9/Dockerfile.centos
+++ b/src/engines/ruby/1.9/Dockerfile.centos
@@ -70,7 +70,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/2.0/Dockerfile.centos b/src/engines/ruby/2.0/Dockerfile.centos
index 9a9190e..24e9513 100644
--- a/src/engines/ruby/2.0/Dockerfile.centos
+++ b/src/engines/ruby/2.0/Dockerfile.centos
@@ -70,7 +70,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/2.1/Dockerfile.centos b/src/engines/ruby/2.1/Dockerfile.centos
index 00a59a1..8840b7e 100644
--- a/src/engines/ruby/2.1/Dockerfile.centos
+++ b/src/engines/ruby/2.1/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/2.2/Dockerfile.centos b/src/engines/ruby/2.2/Dockerfile.centos
index 91d6662..8366bad 100644
--- a/src/engines/ruby/2.2/Dockerfile.centos
+++ b/src/engines/ruby/2.2/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/2.3/Dockerfile.centos b/src/engines/ruby/2.3/Dockerfile.centos
index d73565b..d776fa9 100644
--- a/src/engines/ruby/2.3/Dockerfile.centos
+++ b/src/engines/ruby/2.3/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/2.4/Dockerfile.centos b/src/engines/ruby/2.4/Dockerfile.centos
index da8facb..54b8fa7 100644
--- a/src/engines/ruby/2.4/Dockerfile.centos
+++ b/src/engines/ruby/2.4/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/2.5/Dockerfile.centos b/src/engines/ruby/2.5/Dockerfile.centos
index 8fa6213..578edc2 100644
--- a/src/engines/ruby/2.5/Dockerfile.centos
+++ b/src/engines/ruby/2.5/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/2.6/Dockerfile.centos b/src/engines/ruby/2.6/Dockerfile.centos
index 50180c3..37d6ce6 100644
--- a/src/engines/ruby/2.6/Dockerfile.centos
+++ b/src/engines/ruby/2.6/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/2.7/Dockerfile.centos b/src/engines/ruby/2.7/Dockerfile.centos
index 6c65be7..2c77463 100644
--- a/src/engines/ruby/2.7/Dockerfile.centos
+++ b/src/engines/ruby/2.7/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/3.0/Dockerfile.centos b/src/engines/ruby/3.0/Dockerfile.centos
index 8a3b240..3708d0b 100644
--- a/src/engines/ruby/3.0/Dockerfile.centos
+++ b/src/engines/ruby/3.0/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/3.1/Dockerfile.centos b/src/engines/ruby/3.1/Dockerfile.centos
index e208fde..0c9e094 100644
--- a/src/engines/ruby/3.1/Dockerfile.centos
+++ b/src/engines/ruby/3.1/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/3.2/Dockerfile.centos b/src/engines/ruby/3.2/Dockerfile.centos
index 20dfa5e..6650572 100644
--- a/src/engines/ruby/3.2/Dockerfile.centos
+++ b/src/engines/ruby/3.2/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/3.3/Dockerfile.centos b/src/engines/ruby/3.3/Dockerfile.centos
index c228097..54aabba 100644
--- a/src/engines/ruby/3.3/Dockerfile.centos
+++ b/src/engines/ruby/3.3/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors
diff --git a/src/engines/ruby/3.4/Dockerfile.centos b/src/engines/ruby/3.4/Dockerfile.centos
index 61515e2..30d69be 100644
--- a/src/engines/ruby/3.4/Dockerfile.centos
+++ b/src/engines/ruby/3.4/Dockerfile.centos
@@ -68,7 +68,7 @@ RUN true "${REPRO_RUN_KEY}" && yum makecache -y
 # fun: CentOS 8 has `yum list glibc-langpack-\*` but not CentOS 7 :'(
 RUN yum reinstall -y glibc-common
 
-RUN yum install -y curl gcc make
+RUN yum install -y curl gcc make patch git
 
 # fun: this has to be after `yum install curl gcc make`... but only on aarch64; go figure
 # extra fun: table is botched, localedef not happy, swallow result and test `locale` for errors