Merge pull request #27 from Conjur-Enterprise/update-ruby

CONJSE-1850: Use latest Ruby 3.x version for docs and website

Author: szh

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [1.7.22] - 2024-03-11
 
+### Security
+- Update ruby:3.0.6-slim-bullseye to ruby:3-slim-bullseye for docs and website generation (CONJSE-1850)
+- Update Jekyll to v4.3.3 (CONJSE-1850)
+
 ## [1.7.21] - 2024-01-03
 
 ### Security

bin/Dockerfile.website

@@ -1,4 +1,4 @@
-FROM ruby:3.0.6-slim-bullseye
+FROM ruby:3-slim-bullseye
 
 RUN apt-get -y update && \
     apt-get -y install build-essential && \
@@ -11,4 +11,4 @@ RUN bundle install
 
 WORKDIR /usr/src/app
 
-CMD ["jekyll", "build", "--destination", "/tmp/_site"]
+CMD ["bundle", "exec", "jekyll", "build", "--destination", "/tmp/_site"]

docs/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.6-slim-bullseye
+FROM ruby:3-slim-bullseye
 RUN gem update --system
 RUN gem install bundler jekyll
 RUN mkdir /src

docs/Gemfile

@@ -8,7 +8,7 @@ source 'https://rubygems.org'
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem 'jekyll', '~> 4.1.1'
+gem 'jekyll', '~> 4.3.3'
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem 'minima', '~> 2.5'
@@ -19,7 +19,7 @@ gem 'minima', '~> 2.5'
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem 'jekyll-feed', '~> 0.15'
+  gem 'jekyll-feed', '~> 0.17'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

docs/Gemfile.lock

@@ -1,50 +1,52 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.7)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.2.3)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.13.1)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.5)
+    google-protobuf (3.25.3)
+    http_parser.rb (0.8.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.1)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-feed (0.15.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
-    jekyll-seo-tag (2.6.1)
-      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
+    jekyll-seo-tag (2.8.0)
+      jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.3.0)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
@@ -54,26 +56,28 @@ GEM
       jekyll-seo-tag (~> 2.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    rb-fsevent (0.10.4)
+    public_suffix (5.0.4)
+    rake (13.1.0)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.23.0)
+    rexml (3.2.6)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
-    webrick (1.7.0)
+    sass-embedded (1.69.5)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 4.1.1)
-  jekyll-feed (~> 0.15)
+  jekyll (~> 4.3.3)
+  jekyll-feed (~> 0.17)
   jekyll-redirect-from
   kramdown (>= 2.3.0)
   minima (~> 2.5)
@@ -82,4 +86,4 @@ DEPENDENCIES
   webrick (~> 1.7)
 
 BUNDLED WITH
-   2.2.33
+   2.4.14

docs/_sass/_footer.scss

@@ -55,5 +55,4 @@ footer .right-links li {
 			margin: 2rem 0;
 		}
 	}
-	font-weight: 800;
 }