This is an automated email from the ASF dual-hosted git repository.
F21 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new c71aa7e398 [CALCITE-7786] Use Jekyll docker images for site generation
c71aa7e398 is described below
commit c71aa7e398337ec6dd6adc83a6ec317e9fbe3eb4
Author: Francis Chuang <[email protected]>
AuthorDate: Tue Sep 15 15:49:11 2026 +1000
[CALCITE-7786] Use Jekyll docker images for site generation
---
site/Gemfile.lock | 72 ++++---------------------------------------------
site/docker-compose.yml | 14 +++++-----
2 files changed, 11 insertions(+), 75 deletions(-)
diff --git a/site/Gemfile.lock b/site/Gemfile.lock
index c0f7db3d8a..c5fe300220 100644
--- a/site/Gemfile.lock
+++ b/site/Gemfile.lock
@@ -4,44 +4,19 @@ GEM
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
base64 (0.2.0)
- bigdecimal (4.1.2)
+ bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.3.8)
- csv (3.3.6)
+ csv (3.3.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
- ffi (1.17.4-aarch64-linux-gnu)
- ffi (1.17.4-aarch64-linux-musl)
- ffi (1.17.4-arm-linux-gnu)
- ffi (1.17.4-arm-linux-musl)
- ffi (1.17.4-arm64-darwin)
- ffi (1.17.4-x86_64-darwin)
ffi (1.17.4-x86_64-linux-gnu)
- ffi (1.17.4-x86_64-linux-musl)
forwardable-extended (2.6.0)
- google-protobuf (4.36.1)
- bigdecimal
- rake (~> 13.3)
- google-protobuf (4.36.1-aarch64-linux-gnu)
- bigdecimal
- rake (~> 13.3)
- google-protobuf (4.36.1-aarch64-linux-musl)
- bigdecimal
- rake (~> 13.3)
- google-protobuf (4.36.1-arm64-darwin)
- bigdecimal
- rake (~> 13.3)
- google-protobuf (4.36.1-x86_64-darwin)
- bigdecimal
- rake (~> 13.3)
google-protobuf (4.36.1-x86_64-linux-gnu)
bigdecimal
rake (~> 13.3)
- google-protobuf (4.36.1-x86_64-linux-musl)
- bigdecimal
- rake (~> 13.3)
http_parser.rb (0.8.1)
i18n (1.15.2)
concurrent-ruby (~> 1.0)
@@ -70,7 +45,7 @@ GEM
sass-embedded (~> 1.75)
jekyll-watch (2.2.1)
listen (~> 3.0)
- json (2.21.2)
+ json (2.9.1)
kramdown (2.5.2)
rexml (>= 3.4.4)
kramdown-parser-gfm (1.1.0)
@@ -80,24 +55,10 @@ GEM
logger
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
- logger (1.7.0)
+ logger (1.6.4)
mercenary (0.4.0)
- nokogiri (1.19.4-aarch64-linux-gnu)
- racc (~> 1.4)
- nokogiri (1.19.4-aarch64-linux-musl)
- racc (~> 1.4)
- nokogiri (1.19.4-arm-linux-gnu)
- racc (~> 1.4)
- nokogiri (1.19.4-arm-linux-musl)
- racc (~> 1.4)
- nokogiri (1.19.4-arm64-darwin)
- racc (~> 1.4)
- nokogiri (1.19.4-x86_64-darwin)
- racc (~> 1.4)
nokogiri (1.19.4-x86_64-linux-gnu)
racc (~> 1.4)
- nokogiri (1.19.4-x86_64-linux-musl)
- racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (7.0.5)
@@ -109,38 +70,15 @@ GEM
rexml (3.4.4)
rouge (4.7.0)
safe_yaml (1.0.5)
- sass-embedded (1.104.0-aarch64-linux-gnu)
- google-protobuf (~> 4.31)
- sass-embedded (1.104.0-aarch64-linux-musl)
- google-protobuf (~> 4.31)
- sass-embedded (1.104.0-arm-linux-gnueabihf)
- google-protobuf (~> 4.31)
- sass-embedded (1.104.0-arm-linux-musleabihf)
- google-protobuf (~> 4.31)
- sass-embedded (1.104.0-arm64-darwin)
- google-protobuf (~> 4.31)
- sass-embedded (1.104.0-x86_64-darwin)
- google-protobuf (~> 4.31)
sass-embedded (1.104.0-x86_64-linux-gnu)
google-protobuf (~> 4.31)
- sass-embedded (1.104.0-x86_64-linux-musl)
- google-protobuf (~> 4.31)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.6.0)
webrick (1.9.2)
PLATFORMS
- aarch64-linux-gnu
- aarch64-linux-musl
- arm-linux-gnu
- arm-linux-gnueabihf
- arm-linux-musl
- arm-linux-musleabihf
- arm64-darwin
- x86_64-darwin
x86_64-linux-gnu
- x86_64-linux-musl
DEPENDENCIES
base64 (~> 0.2.0)
@@ -151,4 +89,4 @@ DEPENDENCIES
webrick (~> 1.9.1)
BUNDLED WITH
- 2.5.22
+ 2.6.9
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 6bdaf0db27..22084f3951 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -16,19 +16,17 @@
#
services:
dev:
- image: ruby:3.3.7-slim-bookworm
- working_dir: /root
- command: sh -c "apt-get update && apt-get install -y build-essential
libssl-dev zlib1g-dev ruby-dev bundler wget && wget -O /usr/bin/yq
https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 &&
chmod +x /usr/bin/yq && ./download-avatars.sh && bundle install && bundle exec
jekyll serve --host=0.0.0.0 --watch --force_polling"
+ image: jekyll/jekyll:4
+ command: sh -c "wget -O /usr/bin/yq
https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 &&
chmod +x /usr/bin/yq && ./download-avatars.sh && jekyll serve --host 0.0.0.0
--watch --force_polling"
ports:
- 4000:4000
volumes:
- - .:/root
+ - .:/srv/jekyll
build-site:
- image: ruby:3.3.7-slim-bookworm
- working_dir: /home/jekyll
- command: sh -c "rm -rf /home/jekyll/.bundle /home/jekyll/Gemfile.lock
/home/jekyll/.jekyll-cache /home/target/ && apt-get update && apt-get install
-y build-essential libssl-dev zlib1g-dev ruby-dev bundler wget && wget -O
/usr/bin/yq
https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 &&
chmod +x /usr/bin/yq && ./download-avatars.sh && bundle install && bundle exec
jekyll build && chmod 777 ./*"
+ image: jekyll/jekyll:4
+ command: sh -c "wget -O /usr/bin/yq
https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 &&
chmod +x /usr/bin/yq && ./download-avatars.sh && jekyll build && chmod 777 ./*"
volumes:
- - .:/home/jekyll
+ - .:/srv/jekyll
generate-javadoc:
image: eclipse-temurin:19
working_dir: /usr/src/calcite