fix: drop outdated jekyll container and use local built instead

Gemfile

@@ -10,7 +10,8 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.1.1"
+gem "jekyll", "~> 4.4.1"
+gem "jekyll-sass-converter", "~> 2.0"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.0"

Gemfile.lock

@@ -4,33 +4,39 @@ GEM
     addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     asciidoctor (2.0.15)
+    base64 (0.3.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.3.6)
+    csv (3.3.5)
     date (3.3.4)
-    em-websocket (0.5.2)
+    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.15.0)
+    ffi (1.17.4)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.10)
+    http_parser.rb (0.8.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.1)
+    jekyll (4.4.1)
       addressable (~> 2.4)
+      base64 (~> 0.2)
       colorator (~> 1.0)
+      csv (~> 3.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)
+      json (~> 2.6)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (~> 0.3, >= 0.3.6)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-archives (2.2.1)
       jekyll (>= 3.6, < 5.0)
     jekyll-asciidoc (3.0.0)
@@ -43,20 +49,23 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-sass-converter (2.1.0)
+    jekyll-sass-converter (2.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.7.1)
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
-      rexml
+    json (2.19.3)
+    kramdown (2.5.2)
+      rexml (>= 3.4.4)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.5.1)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     mercenary (0.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
@@ -69,37 +78,38 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (7.0.5)
-    rb-fsevent (0.11.0)
-    rb-inotify (0.10.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.4.2)
-    rouge (3.26.0)
+    rexml (3.4.4)
+    rouge (4.7.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
     stringio (3.1.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     time (0.3.0)
       date
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.6.0)
     uri (0.13.3)
-    webrick (1.8.2)
+    webrick (1.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 4.1.1)
+  jekyll (~> 4.4.1)
   jekyll-archives
   jekyll-asciidoc
   jekyll-auto-authors
   jekyll-feed (~> 0.6)
   jekyll-paginate-v2
+  jekyll-sass-converter (~> 2.0)
   minima (~> 2.0)
   open-uri (~> 0.4.1)
   tzinfo-data
   webrick (~> 1.8)
 
 BUNDLED WITH
-   2.2.16
+  4.0.10

docker-compose.yml

@@ -2,7 +2,7 @@
 
 services:
   jekyll:
-    image: docker.io/bretfisher/jekyll-serve
+    build: jekyll-container/
     # Add --incremental to the commandline
     # https://github.com/BretFisher/jekyll-serve/blob/2119a31476e1c6004a4bea4739b9160fc73e7bda/Dockerfile#L27C5-L27C94
     # Also, enable dev config

docker-compose_with_guides.yml

@@ -2,7 +2,7 @@
 
 services:
   jekyll:
-    image: docker.io/bretfisher/jekyll-serve
+    build: jekyll-container/
     # Add --incremental to the commandline
     # https://github.com/BretFisher/jekyll-serve/blob/2119a31476e1c6004a4bea4739b9160fc73e7bda/Dockerfile#L27C5-L27C94
     # Also, enable dev config

jekyll-container/Dockerfile

@@ -0,0 +1,20 @@
+# Replaces bretfisher/jekyll-serve with a Ruby 3.3 base image
+# to support newer gems (e.g. public_suffix >= 7 requires Ruby >= 3.2)
+FROM ruby:3.3-slim-bookworm
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY docker-entrypoint.sh /usr/local/bin/
+
+RUN gem update --system && gem install jekyll && gem cleanup
+
+EXPOSE 4000
+
+WORKDIR /site
+
+ENTRYPOINT [ "docker-entrypoint.sh" ]
+
+CMD [ "bundle", "exec", "jekyll", "serve", "--force_polling", "-H", "0.0.0.0", "-P", "4000" ]

jekyll-container/docker-entrypoint.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+if [ ! -f Gemfile ]; then
+  echo "NOTE: hmm, I don't see a Gemfile so I don't think there's a jekyll site here"
+  echo "Either you didn't mount a volume, or you mounted it incorrectly."
+  echo "Be sure you're in your jekyll site root and use something like this to launch"
+  echo ""
+  echo "docker compose up"
+  echo ""
+  exit 1
+fi
+
+bundle install --retry 5 --jobs 20
+
+exec "$@"