Skip to content

Commit

Permalink
Add required Git SCL (#3155)
Browse files Browse the repository at this point in the history
  • Loading branch information
mayorova committed Jan 11, 2023
1 parent 76d278a commit c7172af
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
13 changes: 11 additions & 2 deletions openshift/system/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
8 changes: 5 additions & 3 deletions openshift/system/contrib/scl_enable
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c7172af

Please sign in to comment.