From ff53963980848f97ada3af60c60311d00cc11436 Mon Sep 17 00:00:00 2001
From: Stephen Geinosky <geinosky@ucar.edu>
Date: Fri, 5 Jul 2024 10:52:43 -0500
Subject: [PATCH] Use the latest Jekyll Docker image. Update all Jekyll
 plugins. Add webrick to the Gemfile.

---
 Dockerfile         |  2 +-
 Gemfile            | 10 ++++---
 Gemfile.lock       | 71 +++++++++++++++++++++++++---------------------
 docker-compose.yml |  2 --
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bf7be2f..5dd0e39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jekyll/jekyll:3.8.6
+FROM jekyll/jekyll:4.2.2
 
 WORKDIR /project
 
diff --git a/Gemfile b/Gemfile
index be59ac8..aacb64b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,16 +13,18 @@ source "https://rubygems.org"
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 gem "github-pages"
 
+gem "webrick"
+
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
-  gem "jekyll-remote-theme", ">= 0.4.1"
-  gem "jekyll-sitemap", "~> 1.3"
+  gem "jekyll-feed", "~> 0.17"
+  gem "jekyll-remote-theme", ">= 0.4.3"
+  gem "jekyll-sitemap", "~> 1.4"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0" if Gem.win_platform?
+gem "wdm", "~> 0.1.1" if Gem.win_platform?
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 32c9221..73958e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,24 +1,31 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.7)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
+    bigdecimal (3.1.8)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     colorator (1.1.0)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
     dnsruby (1.72.1)
       simpleidn (~> 0.2.1)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
@@ -26,12 +33,11 @@ GEM
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.9.1)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    ffi (1.16.3)
+    faraday (2.9.2)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.17.0-x86_64-linux-musl)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
     github-pages (231)
@@ -89,7 +95,7 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jekyll (3.9.5)
       addressable (~> 2.4)
@@ -208,28 +214,29 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.22.3)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.5)
-    racc (1.7.3)
+    public_suffix (5.1.1)
+    racc (1.8.0)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
+    rexml (3.3.1)
+      strscan
     rouge (3.30.0)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -240,29 +247,29 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
+    simpleidn (0.2.3)
+    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
-    zeitwerk (2.6.13)
+    uri (0.13.0)
+    webrick (1.8.1)
 
 PLATFORMS
-  ruby
+  x86_64-linux-musl
 
 DEPENDENCIES
   github-pages
-  jekyll-feed (~> 0.6)
-  jekyll-remote-theme (>= 0.4.1)
-  jekyll-sitemap (~> 1.3)
+  jekyll (~> 3.9.5)
+  jekyll-feed (~> 0.17)
+  jekyll-remote-theme (>= 0.4.3)
+  jekyll-sitemap (~> 1.4)
   tzinfo-data
+  webrick
 
 BUNDLED WITH
-   2.2.16
+   2.3.25
diff --git a/docker-compose.yml b/docker-compose.yml
index 6385452..85313ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   web:
     container_name: koru-jekyll-site