Merge pull request #71 from cyberark/ruby-upgrade-test

ONYX-10395: Bump ruby version to 3.0.2

Author: semyon-estrin

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.0.0] - 2022-02-01
+
+### Changed
+
+- Upgrade Ruby version from 2.5.8(EOL) to 3.0.2.
+  [cyberark/conjur-base-image#71](https://github.com/cyberark/conjur-base-image/pull/71)
+
 ## [1.0.7] - 2021-12-09
 
 ### Changed

NOTICES.txt

@@ -12,7 +12,7 @@ Section 1: Apache-2.0
 
 Section 2: BSD-2-Clause
 >>> https://github.com/nginx/nginx v1.20
->>> https://github.com/ruby/ruby v2.5.8
+>>> https://github.com/ruby/ruby v3.0.2
 
 Section 3: PostgreSQL License
 >>> https://github.com/postgres/postgres v10_16
@@ -93,7 +93,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
->>> https://github.com/ruby/ruby v2.5.8
+>>> https://github.com/ruby/ruby v3.0.2
 
 Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
 

phusion-ruby-builder/Dockerfile

@@ -11,7 +11,7 @@ FROM openssl-builder:$OPENSSL_BUILDER_TAG as OpenSSL-builder
 FROM phusion/baseimage:$PHUSION_VERSION
 ARG RUBY_MAJOR_VERSION
 ARG RUBY_FULL_VERSION
-ARG RUBY_SHA256=6c0bdf07876c69811a9e7dc237c43d40b1cb6369f68e0e17953d7279b524ad9a
+ARG RUBY_SHA256=5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1
 
 ENV LD_LIBRARY_PATH="/usr/local/ssl/lib"
 

phusion-ruby-builder/build.sh

@@ -3,8 +3,8 @@
 cd "$(dirname "$0")"
 
 PHUSION_VERSION=0.11
-RUBY_MAJOR_VERSION=2.5
-RUBY_FULL_VERSION=2.5.8
+RUBY_MAJOR_VERSION=3.0
+RUBY_FULL_VERSION=3.0.2
 OPENSSL_BUILDER_TAG=1.0.2u-fips-2.0.16
 
 docker build -t phusion-ruby-builder:"$RUBY_FULL_VERSION-fips" \

phusion-ruby-fips/Description.md

@@ -4,7 +4,7 @@
 This image includes the following packages:
 
 * OpenSSL version `1.0.2u`: built with  FIPS 140-2 compliant OpenSSL module version `2.0.16`.
-* Ruby version `2.5`: compiled against the FIPS 140-2 compliant OpenSSL module.
+* Ruby version `3.0.2`: compiled against the FIPS 140-2 compliant OpenSSL module.
 * Postgres client version `10-10.16`: compiled against the FIPS 140-2 compliant OpenSSL module.
 * OpenLDAP version `2.4.46`: built using OpenSSL rather than gnutls and compiled against the FIPS 140-2 compliant OpenSSL module. 
 * Bundler version `2.2.30`.

phusion-ruby-fips/build.sh

@@ -4,7 +4,7 @@ cd "$(dirname "$0")"
 
 PHUSION_VERSION=0.11
 OPENSSL_BUILDER_TAG=1.0.2u-fips-2.0.16
-RUBY_BUILDER_TAG=2.5.8-fips
+RUBY_BUILDER_TAG=3.0.2-fips
 PG_BUILDER_TAG=10-10.16-fips
 OPENLDAP_BUILDER_TAG=2.4.46-fips
 

ubi-ruby-builder/Dockerfile

@@ -7,7 +7,7 @@ ARG RUBY_FULL_VERSION
 FROM registry.access.redhat.com/$UBI_VERSION/ubi
 ARG RUBY_MAJOR_VERSION
 ARG RUBY_FULL_VERSION
-ARG RUBY_SHA256=6c0bdf07876c69811a9e7dc237c43d40b1cb6369f68e0e17953d7279b524ad9a
+ARG RUBY_SHA256=5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1
 
 RUN yum install -y --setopt=tsflags=nodocs gcc \
                                            gcc-c++ \

ubi-ruby-builder/build.sh

@@ -3,8 +3,8 @@
 cd "$(dirname "$0")"
 
 UBI_VERSION=ubi8
-RUBY_MAJOR_VERSION=2.5
-RUBY_FULL_VERSION=2.5.8
+RUBY_MAJOR_VERSION=3.0
+RUBY_FULL_VERSION=3.0.2
 
 docker build -t ubi-ruby-builder:"$RUBY_FULL_VERSION-fips" \
   --build-arg UBI_VERSION="$UBI_VERSION" \

ubi-ruby-fips/Description.md

@@ -4,7 +4,7 @@
 This image includes the following packages:
 
 * OpenSSL version `1.1.1c`: with FIPS 140-2 compliant OpenSSL module from RedHat UBI 8.
-* Ruby version `2.5`: compiled against the FIPS 140-2 compliant OpenSSL module.
+* Ruby version `3.0.2`: compiled against the FIPS 140-2 compliant OpenSSL module.
 * Postgres client version `10-10.16`: compiled against the FIPS 140-2 compliant OpenSSL module.
 * Bundler version `2.2.30`.
 

ubi-ruby-fips/README.md

@@ -2,7 +2,7 @@
 This container image includes UBI version `8` which contains the following packages:
 
 * OpenSSL version `1.1.1c`: with FIPS 140-2 compliant OpenSSL module from RedHat UBI 8.
-* Ruby version `2.5`: compiled against the FIPS 140-2 compliant OpenSSL module.
+* Ruby version `3.0.2`: compiled against the FIPS 140-2 compliant OpenSSL module.
 * Postgres client version `10-10.16`: compiled against the FIPS 140-2 compliant OpenSSL module.
 * Bundler version `2.2.30`.