From c84310f284c32066de291d4e4372ffc3dc45934b Mon Sep 17 00:00:00 2001
From: Jan <170526384+jaameemoo@users.noreply.github.com>
Date: Wed, 10 Dec 2025 16:19:37 +0100
Subject: [PATCH 1/7] Switch Jekyll Docker image to v4.2.2

---
 Dockerfile   |   7 +-
 Gemfile      |   5 +-
 Gemfile.lock | 277 ++++++++-------------------------------------------
 3 files changed, 46 insertions(+), 243 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4ba77060e..a0c164267 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
-FROM jekyll/jekyll:3
-RUN gem install bundler -v 2.4.22
+FROM jekyll/jekyll:4.2.2
+RUN gem install bundler -v 2.6.9
+WORKDIR /srv/jekyll
 COPY Gemfile Gemfile.lock ./
 RUN bundle install
 COPY . .
-ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]
\ No newline at end of file
+ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]
diff --git a/Gemfile b/Gemfile
index e061f9e3a..12fa03698 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,12 +13,9 @@ source "https://rubygems.org"
 #gem "just-the-docs"
 gem "jekyll-remote-theme"
 gem "just-the-docs", github: "pdmosses/just-the-docs", branch: "combination-rec-nav"
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-gem "github-pages", group: :jekyll_plugins
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.12"
+  # gem "jekyll-feed", "~> 0.12"
 end
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/Gemfile.lock b/Gemfile.lock
index 04916c594..6278ee978 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,285 +12,90 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    bigdecimal (3.3.1)
     colorator (1.1.0)
-    commonmarker (0.23.4)
-    concurrent-ruby (1.1.10)
-    dnsruby (1.61.9)
-      simpleidn (~> 0.1)
+    concurrent-ruby (1.3.5)
+    csv (3.3.5)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
-      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    ffi (1.15.5)
+    ffi (1.17.2)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (226)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.2)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.2.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
-      jekyll-include-cache (= 0.2.1)
-      jekyll-mentions (= 1.6.0)
-      jekyll-optional-front-matter (= 0.3.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.16.0)
-      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.3)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.8.0)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.2.0)
-      jekyll-theme-cayman (= 0.2.0)
-      jekyll-theme-dinky (= 0.2.0)
-      jekyll-theme-hacker (= 0.2.0)
-      jekyll-theme-leap-day (= 0.2.0)
-      jekyll-theme-merlot (= 0.2.0)
-      jekyll-theme-midnight (= 0.2.0)
-      jekyll-theme-minimal (= 0.2.0)
-      jekyll-theme-modernist (= 0.2.0)
-      jekyll-theme-primer (= 0.6.0)
-      jekyll-theme-slate (= 0.2.0)
-      jekyll-theme-tactile (= 0.2.0)
-      jekyll-theme-time-machine (= 0.2.0)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
-      kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.3)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.13.4, < 2.0)
-      rouge (= 3.26.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 3.0, < 5.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.14.1)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
+    google-protobuf (4.33.2)
+      bigdecimal
+      rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.2)
+    jekyll (4.4.1)
       addressable (~> 2.4)
+      base64 (~> 0.2)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      json (~> 2.6)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.3, >= 0.3.6)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.4.0)
-      commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.2.0)
-      commonmarker (~> 0.23.4)
-      jekyll (~> 3.9.0)
-      jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 4.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
-      jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
-    jekyll-mentions (1.6.0)
-      html-pipeline (~> 2.3)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-optional-front-matter (0.3.2)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.3.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.16.0)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.1)
-      jekyll (>= 3.3, < 5.0)
     jekyll-remote-theme (0.4.3)
       addressable (~> 2.0)
       jekyll (>= 3.5, < 5.0)
       jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
       rubyzip (>= 1.3.0, < 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
-    jekyll-sitemap (1.4.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.6.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.3)
-      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.2)
-      rexml
+    json (2.17.1)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.8.0)
-    minima (2.5.1)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-feed (~> 0.9)
-      jekyll-seo-tag (~> 2.1)
-    minitest (5.15.0)
-    multipart-post (2.1.1)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    octokit (4.22.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    racc (1.6.0)
+    public_suffix (7.0.0)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.26.0)
-    ruby2_keywords (0.0.5)
+    rexml (3.4.4)
+    rouge (4.6.1)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
+    sass-embedded (1.95.1)
+      google-protobuf (~> 4.31)
+      rake (>= 13)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.1)
     unicode-display_width (1.8.0)
-    zeitwerk (2.5.4)
+    webrick (1.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
-  jekyll-feed (~> 0.12)
   jekyll-remote-theme
   just-the-docs!
   tzinfo (~> 1.2)
@@ -298,4 +103,4 @@ DEPENDENCIES
   wdm (~> 0.1.1)
 
 BUNDLED WITH
-   2.3.9
+   2.6.9

From 030bfe0443baed36ba8dd919d2dc3961a5876659 Mon Sep 17 00:00:00 2001
From: Jan <170526384+jaameemoo@users.noreply.github.com>
Date: Wed, 10 Dec 2025 16:26:02 +0100
Subject: [PATCH 2/7] Normalize lock file

$ bundle lock --normalize-platforms
---
 Gemfile.lock | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6278ee978..cf546e36e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,10 +24,44 @@ GEM
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     ffi (1.17.2)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86-linux-gnu)
+    ffi (1.17.2-x86-linux-musl)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     forwardable-extended (2.6.0)
     google-protobuf (4.33.2)
       bigdecimal
       rake (>= 13)
+    google-protobuf (4.33.2-aarch64-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.33.2-aarch64-linux-musl)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.33.2-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.33.2-x86-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.33.2-x86-linux-musl)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.33.2-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.33.2-x86_64-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.33.2-x86_64-linux-musl)
+      bigdecimal
+      rake (>= 13)
     http_parser.rb (0.8.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
@@ -87,13 +121,59 @@ GEM
     sass-embedded (1.95.1)
       google-protobuf (~> 4.31)
       rake (>= 13)
+    sass-embedded (1.95.1-aarch64-linux-android)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-aarch64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-aarch64-linux-musl)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-arm-linux-androideabi)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-arm-linux-gnueabihf)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-arm-linux-musleabihf)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-arm64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-riscv64-linux-android)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-riscv64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-riscv64-linux-musl)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-x86_64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-x86_64-linux-android)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-x86_64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.95.1-x86_64-linux-musl)
+      google-protobuf (~> 4.31)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     unicode-display_width (1.8.0)
     webrick (1.9.2)
 
 PLATFORMS
+  aarch64-linux-android
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-androideabi
+  arm-linux-gnu
+  arm-linux-gnueabihf
+  arm-linux-musl
+  arm-linux-musleabihf
+  arm64-darwin
+  riscv64-linux-android
+  riscv64-linux-gnu
+  riscv64-linux-musl
   ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-android
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   jekyll-remote-theme

From e29521edf7cb07f61f1eb80d3116c34c15356d9c Mon Sep 17 00:00:00 2001
From: Jan <170526384+jaameemoo@users.noreply.github.com>
Date: Wed, 10 Dec 2025 16:59:13 +0100
Subject: [PATCH 3/7] Chown during copying

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a0c164267..1ff65fce1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM jekyll/jekyll:4.2.2
 RUN gem install bundler -v 2.6.9
 WORKDIR /srv/jekyll
-COPY Gemfile Gemfile.lock ./
+COPY --chown=jekyll:jekyll Gemfile Gemfile.lock ./
 RUN bundle install
-COPY . .
+COPY --chown=jekyll:jekyll . .
 ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]

From 2d98235f0c4f33f7507c252ea2932a279d35eb76 Mon Sep 17 00:00:00 2001
From: Jan <170526384+jaameemoo@users.noreply.github.com>
Date: Wed, 10 Dec 2025 16:59:32 +0100
Subject: [PATCH 4/7] Remove dependency on forked Jekyll theme

---
 Gemfile      |  4 ++--
 Gemfile.lock | 18 ++++++------------
 _config.yml  |  4 +---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 12fa03698..974826478 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,9 +10,9 @@ source "https://rubygems.org"
 # gem "jekyll", "~> 4.1.1"
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 # gem "minima", "~> 2.5"
-#gem "just-the-docs"
+gem "just-the-docs"
 gem "jekyll-remote-theme"
-gem "just-the-docs", github: "pdmosses/just-the-docs", branch: "combination-rec-nav"
+# gem "just-the-docs", github: "pdmosses/just-the-docs", branch: "combination-rec-nav"
 # If you have any plugins, put them here!
 group :jekyll_plugins do
   # gem "jekyll-feed", "~> 0.12"
diff --git a/Gemfile.lock b/Gemfile.lock
index cf546e36e..5709cd6fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,3 @@
-GIT
-  remote: https://github.com/pdmosses/just-the-docs.git
-  revision: 429b51844fbcd9870dab55c4e844aac302170123
-  branch: combination-rec-nav
-  specs:
-    just-the-docs (0.3.3)
-      jekyll (>= 3.8.5)
-      jekyll-include-cache (>= 0.2.1)
-      jekyll-seo-tag (>= 2.0)
-      rake (>= 12.3.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -98,6 +87,11 @@ GEM
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     json (2.17.1)
+    just-the-docs (0.3.3)
+      jekyll (>= 3.8.5)
+      jekyll-include-cache (>= 0.2.1)
+      jekyll-seo-tag (>= 2.0)
+      rake (>= 12.3.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
@@ -177,7 +171,7 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll-remote-theme
-  just-the-docs!
+  just-the-docs
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.1)
diff --git a/_config.yml b/_config.yml
index 9fad12c89..30bc38706 100644
--- a/_config.yml
+++ b/_config.yml
@@ -25,9 +25,7 @@ email: support@meemoo.be
 twitter_username: meemoo_be
 #github_username:  jekyll
 
-#remote_theme: pmarsceill/just-the-docs
-# TEMP: use pdmosses template until his PR is merged
-remote_theme: pdmosses/just-the-docs@combination-rec-nav
+remote_theme: just-the-docs/just-the-docs
 
 # Build settings
 #theme: "just-the-docs"

From 00b3a2fbd7899d8cc3f8c39d33a466a8853dcaef Mon Sep 17 00:00:00 2001
From: Jan <170526384+jaameemoo@users.noreply.github.com>
Date: Wed, 10 Dec 2025 17:49:46 +0100
Subject: [PATCH 5/7] Switch Docker image

---
 Dockerfile                                   |  6 ++--
 Gemfile                                      | 31 ++------------------
 Gemfile.lock                                 | 25 ++++++----------
 _config.yml                                  | 23 +++------------
 _posts/2020-09-23-welcome-to-jekyll.markdown | 29 ------------------
 index.md                                     |  3 --
 6 files changed, 18 insertions(+), 99 deletions(-)
 delete mode 100644 _posts/2020-09-23-welcome-to-jekyll.markdown

diff --git a/Dockerfile b/Dockerfile
index 1ff65fce1..1727b72ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM jekyll/jekyll:4.2.2
+FROM ruby:trixie
 RUN gem install bundler -v 2.6.9
 WORKDIR /srv/jekyll
-COPY --chown=jekyll:jekyll Gemfile Gemfile.lock ./
+COPY Gemfile Gemfile.lock ./
 RUN bundle install
-COPY --chown=jekyll:jekyll . .
+COPY . .
 ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]
diff --git a/Gemfile b/Gemfile
index 974826478..a2a16cad2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,31 +1,4 @@
 source "https://rubygems.org"
-# Hello! This is where you manage which Jekyll version is used to run.
-# When you want to use a different version, change it below, save the
-# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
-#
-#     bundle exec jekyll serve
-#
-# This will help ensure the proper Jekyll version is running.
-# Happy Jekylling!
-# gem "jekyll", "~> 4.1.1"
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-# gem "minima", "~> 2.5"
+gem "logger"
+gem "jekyll"
 gem "just-the-docs"
-gem "jekyll-remote-theme"
-# gem "just-the-docs", github: "pdmosses/just-the-docs", branch: "combination-rec-nav"
-# If you have any plugins, put them here!
-group :jekyll_plugins do
-  # gem "jekyll-feed", "~> 0.12"
-end
-
-# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
-# and associated library.
-platforms :mingw, :x64_mingw, :mswin, :jruby do
-  gem "tzinfo", "~> 1.2"
-  gem "tzinfo-data"
-end
-
-# Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
-
-
diff --git a/Gemfile.lock b/Gemfile.lock
index 5709cd6fd..c3f975931 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,11 +75,6 @@ GEM
       webrick (~> 1.7)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
-    jekyll-remote-theme (0.4.3)
-      addressable (~> 2.0)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
-      rubyzip (>= 1.3.0, < 3.0)
     jekyll-sass-converter (3.0.0)
       sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
@@ -87,9 +82,9 @@ GEM
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     json (2.17.1)
-    just-the-docs (0.3.3)
+    just-the-docs (0.10.1)
       jekyll (>= 3.8.5)
-      jekyll-include-cache (>= 0.2.1)
+      jekyll-include-cache
       jekyll-seo-tag (>= 2.0)
       rake (>= 12.3.1)
     kramdown (2.5.1)
@@ -100,17 +95,17 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (7.0.0)
-    rake (13.0.6)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rexml (3.4.4)
     rouge (4.6.1)
-    rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass-embedded (1.95.1)
       google-protobuf (~> 4.31)
@@ -143,9 +138,9 @@ GEM
       google-protobuf (~> 4.31)
     sass-embedded (1.95.1-x86_64-linux-musl)
       google-protobuf (~> 4.31)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.8.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.6.0)
     webrick (1.9.2)
 
 PLATFORMS
@@ -170,11 +165,9 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  jekyll-remote-theme
+  jekyll
   just-the-docs
-  tzinfo (~> 1.2)
-  tzinfo-data
-  wdm (~> 0.1.1)
+  logger
 
 BUNDLED WITH
    2.6.9
diff --git a/_config.yml b/_config.yml
index 30bc38706..b1f625e97 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,13 +11,8 @@
 # If you need help with YAML syntax, here are some quick references for you: 
 # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
 # https://learnxinyminutes.com/docs/yaml/
-#
-# Site settings
-# These are used to personalize your new site. If you look in the HTML files,
-# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
-# You can create any custom variable you would like, and they will be accessible
-# in the templates via {{ site.myvariable }}.
 
+# Site settings
 title: Developer documentatie meemoo
 email: support@meemoo.be
 #baseurl: "" # the subpath of your site, e.g. /blog
@@ -25,12 +20,10 @@ email: support@meemoo.be
 twitter_username: meemoo_be
 #github_username:  jekyll
 
-remote_theme: just-the-docs/just-the-docs
-
 # Build settings
-#theme: "just-the-docs"
-#plugins:
-#  - jekyll-feed
+theme: "just-the-docs"
+# plugins:
+#   - jekyll-feed
 
 # Exclude from processing.
 # The following items will not be processed, by default.
@@ -41,16 +34,8 @@ remote_theme: just-the-docs/just-the-docs
 # their entries' file path in the `include:` list.
 #
 # exclude:
-#   - .sass-cache/
-#   - .jekyll-cache/
-#   - gemfiles/
 #   - Gemfile
 #   - Gemfile.lock
-#   - node_modules/
-#   - vendor/bundle/
-#   - vendor/cache/
-#   - vendor/gems/
-#   - vendor/ruby/
 
 color_scheme: meemoo
 
diff --git a/_posts/2020-09-23-welcome-to-jekyll.markdown b/_posts/2020-09-23-welcome-to-jekyll.markdown
deleted file mode 100644
index 46c017e8e..000000000
--- a/_posts/2020-09-23-welcome-to-jekyll.markdown
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: post
-title:  "Welcome to Jekyll!"
-date:   2020-09-23 15:55:48 +0200
-categories: jekyll update
----
-You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
-
-Jekyll requires blog post files to be named according to the following format:
-
-`YEAR-MONTH-DAY-title.MARKUP`
-
-Where `YEAR` is a four-digit number, `MONTH` and `DAY` are both two-digit numbers, and `MARKUP` is the file extension representing the format used in the file. After that, include the necessary front matter. Take a look at the source for this post to get an idea about how it works.
-
-Jekyll also offers powerful support for code snippets:
-
-{% highlight ruby %}
-def print_hi(name)
-  puts "Hi, #{name}"
-end
-print_hi('Tom')
-#=> prints 'Hi, Tom' to STDOUT.
-{% endhighlight %}
-
-Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
-
-[jekyll-docs]: https://jekyllrb.com/docs/home
-[jekyll-gh]:   https://github.com/jekyll/jekyll
-[jekyll-talk]: https://talk.jekyllrb.com/
diff --git a/index.md b/index.md
index 693cd361e..723832088 100644
--- a/index.md
+++ b/index.md
@@ -1,7 +1,4 @@
 ---
-# Feel free to add content and custom Front Matter to this file.
-# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-
 layout: home
 nav_exclude: true
 ---

From 85d988f2f2f4111a38bb37cc9cab2c5a9be9bbec Mon Sep 17 00:00:00 2001
From: Jan <170526384+jaameemoo@users.noreply.github.com>
Date: Wed, 10 Dec 2025 18:01:59 +0100
Subject: [PATCH 6/7] Pin versions in Gemfile

---
 Gemfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a2a16cad2..4f21b4a0a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org"
-gem "logger"
-gem "jekyll"
-gem "just-the-docs"
+gem "logger", "~> 1.6", ">= 1.6.5"
+gem "jekyll", "~> 4.4", ">= 4.4.1"
+gem "just-the-docs", "~>0.10", ">= 0.10.1"

From e7b155edcc8a52d6af70a4ce5ee5b02dec9ec73b Mon Sep 17 00:00:00 2001
From: Jan <170526384+jaameemoo@users.noreply.github.com>
Date: Tue, 16 Dec 2025 12:21:18 +0100
Subject: [PATCH 7/7] Switch to slim base image

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1727b72ac..ca0d7c04b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
-FROM ruby:trixie
+FROM ruby:3.4-slim-trixie
 RUN gem install bundler -v 2.6.9
 WORKDIR /srv/jekyll
 COPY Gemfile Gemfile.lock ./
+RUN apt-get update && apt-get install -y --no-install-recommends build-essential git && rm -rf /var/lib/apt/lists/*
 RUN bundle install
 COPY . .
 ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]