Merge branch 'master' into 1.2.1-draft-main

.github/workflows/publish-drafts.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Build Jekyll Site
         uses: helaili/jekyll-action@master
         env:
-          PLANTUML_VERSION: "1.2021.10"
+          PLANTUML_VERSION: "1.2023.6"
         with:
           # this is dodgy.. the jekyll action wants to build things outside our workspace so setting it to
           # this brings it back into the workspace where files will be kept for the deploy

.github/workflows/publish-main.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Build Jekyll Site
         uses: helaili/jekyll-action@master
         env:
-          PLANTUML_VERSION: "1.2021.10"
+          PLANTUML_VERSION: "1.2023.6"
         with:
           # this is dodgy.. the jekyll action wants to build things outside our workspace so setting it to
           # this brings it back into the workspace where files will be kept for the deploy

Gemfile

@@ -0,0 +1 @@
+jekyll-builder-local/Gemfile

Gemfile.lock

@@ -12,30 +12,33 @@ GEM
     ffi (1.15.5)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
+    google-protobuf (3.23.2-x86_64-darwin)
+    google-protobuf (3.23.2-x86_64-linux)
     http_parser.rb (0.8.0)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.2)
+    jekyll (4.3.2)
       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.3)
+      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 (~> 2.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-plantuml (1.3.4)
+    jekyll-plantuml (1.4.1)
       jekyll (> 2.0)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-spaceship (0.10.2)
@@ -58,44 +61,43 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    nokogiri (1.15.2-arm64-darwin)
-      racc (~> 1.4)
     nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.0.1)
-    racc (1.6.2)
+    racc (1.7.0)
     rainbow (3.1.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.30.0)
+    rouge (4.1.2)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.8.0)
+    sass-embedded (1.63.3-x86_64-darwin)
+      google-protobuf (~> 3.23)
+    sass-embedded (1.63.3-x86_64-linux-musl)
+      google-protobuf (~> 3.23)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.4.2)
     webrick (1.8.1)
 
 PLATFORMS
-  universal-darwin-22
-  x86_64-linux
+  x86_64-darwin-22
+  x86_64-linux-musl
 
 DEPENDENCIES
-  jekyll (~> 4.2.2)
+  jekyll (~> 4.3.2)
   jekyll-feed (~> 0.12)
-  jekyll-plantuml
+  jekyll-plantuml (~> 1.4.1)
   jekyll-spaceship
   minima (~> 2.5)
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.1)
-  webrick (~> 1.8)
 
 BUNDLED WITH
-   2.4.13
+   2.4.10

Makefile

@@ -7,13 +7,12 @@ BUILDER=jekyll-builder-local
 # a folder to handle dependency building of docker images (kind of)
 STAMP_DIR=$(BUILDER)/stamps
 
-.PHONY: clean serve
-
+.PHONY: clean serve$
 serve: $(BUILDER)
-	docker run --rm --volume="$(ROOT_DIR):/srv/jekyll" \
-               --volume="$(ROOT_DIR)/vendor/bundle:/usr/local/bundle" \
+	docker run --rm -it \
+               --volume="$(ROOT_DIR):/srv/jekyll" \
                --env JEKYLL_ENV=development -p 4000:4000 \
-               $(BUILDER) jekyll serve
+               $(BUILDER) ./install-and-serve
 
 $(BUILDER): $(STAMP_DIR)/$(BUILDER)
 

_plugins/jekyll-plantuml-svg.rb

@@ -50,7 +50,7 @@ def render(context)
       FileUtils.mkdir_p(File.dirname(uml))
 
       # if we don't have both files cached then lets regenerate
-      if !File.exists?(uml) or !File.exists?(svg)
+      if !File.exist?(uml) or !File.exist?(svg)
         File.open(uml, 'w') { |f|
           f.write("@startuml\n")
           f.write(super)

install-and-serve

@@ -0,0 +1,3 @@
+#!/bin/ash
+bundle install
+bundle exec jekyll serve --host "0.0.0.0"

jekyll-builder-local/Dockerfile

@@ -1,14 +1,19 @@
-FROM jekyll/builder:4.2.2
+FROM ruby:3.2.2-alpine
 
-ENV PLANTUML_VERSION=1.2021.10
+ENV PLANTUML_VERSION=1.2023.6
 ENV LANG en_US.UTF-8
 
+WORKDIR /srv/jekyll
+COPY Gemfile .
+
 # construct a Jekyll builder that comes pre-installed with plantuml runnable as a binary
 RUN \
   apk add --no-cache graphviz wget ca-certificates && \
-  apk add --no-cache graphviz wget ca-certificates ttf-dejavu fontconfig && \
-  wget "http://downloads.sourceforge.net/project/plantuml/${PLANTUML_VERSION}/plantuml.${PLANTUML_VERSION}.jar" -O /usr/bin/plantuml.jar && \
-  apk del wget ca-certificates && \
-  gem update --system 3.4.13
+  apk add --no-cache graphviz wget ca-certificates ttf-dejavu fontconfig build-base && \
+  wget "http://downloads.sourceforge.net/project/plantuml/${PLANTUML_VERSION}/plantuml.${PLANTUML_VERSION}.jar" -O /usr/bin/plantuml.jar
+
+EXPOSE 4000/tcp
+
+#gem update --system 3.4.13 \
 
 COPY plantuml /usr/bin

jekyll-builder-local/Gemfile

@@ -0,0 +1,28 @@
+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.3.2"
+
+gem "minima", "~> 2.5"
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.12"
+  gem "jekyll-spaceship"
+  gem "jekyll-plantuml", "~> 1.4.1"
+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]