From c7172af1b24887177063de24b900517599f70bb8 Mon Sep 17 00:00:00 2001
From: Daria Mayorova <mayorova@users.noreply.github.com>
Date: Wed, 11 Jan 2023 13:26:40 +0100
Subject: [PATCH] Add required Git SCL (#3155)

---
 openshift/system/Dockerfile         | 13 +++++++++++--
 openshift/system/contrib/scl_enable |  8 +++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/openshift/system/Dockerfile b/openshift/system/Dockerfile
index cf17209ebd..70c211fe23 100644
--- a/openshift/system/Dockerfile
+++ b/openshift/system/Dockerfile
@@ -2,12 +2,20 @@ FROM quay.io/centos7/ruby-26-centos7
 
 USER root
 
+ENV RUBY_MAJOR_VERSION=2 \
+    RUBY_MINOR_VERSION=6
+
+ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
+    RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"
+
 ARG BUNDLER_ENV
 ENV BUNDLER_ENV="${BUNDLER_ENV}" \
     TZ=:/etc/localtime \
     BUNDLE_GEMFILE=Gemfile \
     BUNDLE_WITHOUT=development:test \
-    NODEJS_SCL=rh-nodejs12
+    NODEJS_SCL=rh-nodejs12 \
+    RUBY_SCL="rh-ruby${RUBY_SCL_NAME_VERSION}" \
+    GIT_SCL=rh-git227
 
 WORKDIR /opt/system
 
@@ -22,7 +30,8 @@ RUN yum-config-manager --save --setopt=cbs.centos.org_repos_sclo7-rh-ruby26-rh-c
               mysql \
               postgresql10 postgresql10-devel postgresql10-libs \
               file \
-              rh-nodejs12 \
+              $NODEJS_SCL \
+              $GIT_SCL \
     && yum install -y epel-release \
     && yum -y clean all
 
diff --git a/openshift/system/contrib/scl_enable b/openshift/system/contrib/scl_enable
index 1fab8cf95f..36018a1b3d 100755
--- a/openshift/system/contrib/scl_enable
+++ b/openshift/system/contrib/scl_enable
@@ -1,4 +1,6 @@
-# This file contains automatic SCL enablement.
+# IMPORTANT: Do not add more content to this file unless you know what you are
+#            doing. This file is sourced everytime the shell session is opened.
+#
+# This will make scl collection binaries work out of box.
 unset BASH_ENV PROMPT_COMMAND ENV
-source scl_source enable rh-ruby26
-source scl_source enable $NODEJS_SCL
+source scl_source enable $NODEJS_SCL $RUBY_SCL $GIT_SCL