This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-site.git
commit ea24a8452c19b53b8e4bf3f470d4ff68405f7972 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Mar 19 07:55:46 2025 +0100 Upgrade Jekyll docker file This change upgrades Jekyll's docker file, since the old images are no longer available. --- Dockerfile | 13 ++++--------- Gemfile | 34 ++++++++++++++++------------------ 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c7f89ca..704b3856 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM ruby:2.7.1-alpine3.11 as dependencies +FROM ruby:alpine AS dependencies RUN apk --no-cache add \ zlib-dev \ @@ -30,9 +30,7 @@ RUN apk --no-cache add \ zlib-dev \ vips-dev \ sqlite-dev \ - cmake - -RUN apk --no-cache add \ + cmake \ linux-headers \ openjdk8-jre \ less \ @@ -47,17 +45,14 @@ RUN apk --no-cache add \ shadow \ bash \ su-exec \ - nodejs-npm \ + npm \ libressl \ yarn WORKDIR /root/build -RUN gem install bundler:1.17.3 -ENV BUNDLE_CLEAN=false - +RUN gem install bundler COPY Gemfile . - RUN bundle config clean RUN bundle install diff --git a/Gemfile b/Gemfile index 0928f0ac..7fb75e96 100644 --- a/Gemfile +++ b/Gemfile @@ -22,25 +22,23 @@ source "https://rubygems.org"; # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 4.2.0" +gem "jekyll", "~> 4.2.2" + # This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.5" -# 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 +gem "minima", "~> 2.5.2" + +# To run Jekyll on Ruby 3.0 or higher +gem "webrick", "~> 1.9" +# To run Jekyll on Ruby 3.4 or higher +gem "base64", "~> 0.2.0" +gem "bigdecimal", "~> 3.1" +gem "csv", "~> 3.3" +# To run Jekyll on Ruby 3.5 or higher +gem "logger", "~> 1.6" + # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.12" - gem 'jekyll-asciidoc', '~> 2.1.1' + gem "jekyll-feed", "~> 0.17.0" + gem "jekyll-asciidoc", "~> 2.1.1" + gem "jekyll-sass-converter", "~> 2.2.0" 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] -
