From 7536e87b98948b5d52b02a1ca5200640f41c90b2 Mon Sep 17 00:00:00 2001 From: Alphonse Bendt <370821+abendt@users.noreply.github.com> Date: Sun, 10 Nov 2024 11:43:27 +0100 Subject: [PATCH] Update docker image, update jekyll version (#25) update docker ruby image update jekyll & minima version --- docker/Dockerfile | 2 +- docker/Gemfile | 6 ++-- docker/Gemfile.lock | 88 +++++++++++++++++++++++++++------------------ 3 files changed, 58 insertions(+), 38 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3412fa8..4681090 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7 +FROM ruby:3.3 ENV BUNDLE_GEMFILE=/app/bundle/Gemfile diff --git a/docker/Gemfile b/docker/Gemfile index 4e694d1..efeacc2 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -8,12 +8,12 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.8.6" +gem "jekyll", "~> 4.3.4" # This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.5.1" +gem "minima", "~> 2.5.2" -gem "jekyll_github_sample" +gem "jekyll_github_sample", git: "https://github.com/bwillis/jekyll-github-sample", ref: 'master' # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index 2cf1db9..120ebf4 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: https://github.com/bwillis/jekyll-github-sample + revision: 57a1529af40ed4ed566d469537e2656d062939bd + ref: master + specs: + jekyll_github_sample (0.3.2) + activesupport (>= 4.0, < 7.0) + jekyll (>= 3.0, < 5.0) + GEM remote: https://rubygems.org/ specs: @@ -7,89 +16,100 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.16.3) + ffi (1.17.0) forwardable-extended (2.6.0) + google-protobuf (4.28.3) + bigdecimal + rake (>= 13) http_parser.rb (0.8.0) - i18n (0.9.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) - jekyll (3.8.7) + jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.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.14) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-plantuml (1.4.1) jekyll (> 2.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-watch (2.2.1) listen (~> 3.0) - jekyll_github_sample (0.3.2) - activesupport (>= 4.0, < 7.0) - jekyll (>= 3.0, < 5.0) - kramdown (1.17.0) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.4) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) - minima (2.5.1) + mercenary (0.4.0) + minima (2.5.2) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.20.0) + minitest (5.25.1) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.3) + public_suffix (6.0.1) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rouge (3.30.0) + rexml (3.3.9) + rouge (4.4.0) 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) + sass-embedded (1.80.6) + google-protobuf (~> 4.28) + rake (>= 13) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) tzinfo-data (1.2023.3) tzinfo (>= 1.0.0) + unicode-display_width (2.6.0) wdm (0.1.1) - zeitwerk (2.6.12) + webrick (1.9.0) + zeitwerk (2.7.1) PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.8.6) + jekyll (~> 4.3.4) jekyll-feed (~> 0.6) jekyll-plantuml - jekyll_github_sample - minima (~> 2.5.1) + jekyll_github_sample! + minima (~> 2.5.2) tzinfo (~> 1.2) tzinfo-data wdm (~> 0.1.0) BUNDLED WITH - 2.1.4 + 2.5.22