This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
The following commit(s) were added to refs/heads/main by this push:
new 4d3aaac79 [CALCITE-6842] Upgrade vulnerable ruby libraries used in
Jekyll site generation
4d3aaac79 is described below
commit 4d3aaac79332de22a7935fe09c478a490dab69c8
Author: Francis Chuang <[email protected]>
AuthorDate: Mon Feb 17 10:04:52 2025 +1100
[CALCITE-6842] Upgrade vulnerable ruby libraries used in Jekyll site
generation
---
.../publish-non-release-website-updates.yml | 2 +-
.../publish-site-and-javadocs-on-release.yml | 2 +-
site/.gitignore | 1 +
site/Gemfile | 2 +-
site/Gemfile.lock | 153 ++++++++++++++++-----
site/_sass/_style.scss | 76 +++++-----
site/css/screen.scss | 12 +-
site/docker-compose.yml | 14 +-
8 files changed, 178 insertions(+), 84 deletions(-)
diff --git a/.github/workflows/publish-non-release-website-updates.yml
b/.github/workflows/publish-non-release-website-updates.yml
index 9c85d1481..8b9a2e6fb 100644
--- a/.github/workflows/publish-non-release-website-updates.yml
+++ b/.github/workflows/publish-non-release-website-updates.yml
@@ -36,7 +36,7 @@ jobs:
- name: Build site
working-directory: site
run: |
- docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g)
build-site
+ docker compose run build-site
- uses: actions/checkout@v4
with:
repository: apache/calcite-site
diff --git a/.github/workflows/publish-site-and-javadocs-on-release.yml
b/.github/workflows/publish-site-and-javadocs-on-release.yml
index 7710087d9..651bbb4b3 100644
--- a/.github/workflows/publish-site-and-javadocs-on-release.yml
+++ b/.github/workflows/publish-site-and-javadocs-on-release.yml
@@ -29,7 +29,7 @@ jobs:
- name: Build site
working-directory: site
run: |
- docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g)
build-site
+ docker compose run build-site
- name: Build javadoc
working-directory: site
run: |
diff --git a/site/.gitignore b/site/.gitignore
index 9af2c3587..9ffdecd2e 100644
--- a/site/.gitignore
+++ b/site/.gitignore
@@ -1,2 +1,3 @@
.sass-cache
.jekyll-metadata
+.bundle/cache
diff --git a/site/Gemfile b/site/Gemfile
index 0348042d9..25391b6b6 100644
--- a/site/Gemfile
+++ b/site/Gemfile
@@ -15,7 +15,7 @@
#
source 'https://rubygems.org'
gem 'jekyll', '~>4'
-gem "webrick", "~> 1.8"
+gem "webrick", "~> 1.9.1"
group :jekyll_plugins do
gem 'jekyll-redirect-from'
diff --git a/site/Gemfile.lock b/site/Gemfile.lock
index ba9b9a6fa..335b8992a 100644
--- a/site/Gemfile.lock
+++ b/site/Gemfile.lock
@@ -1,73 +1,164 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
+ base64 (0.2.0)
+ bigdecimal (3.1.9)
colorator (1.1.0)
- concurrent-ruby (1.1.10)
+ concurrent-ruby (1.3.5)
+ csv (3.3.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
- ffi (1.15.5)
+ ffi (1.17.1)
+ ffi (1.17.1-aarch64-linux-gnu)
+ ffi (1.17.1-aarch64-linux-musl)
+ ffi (1.17.1-arm-linux-gnu)
+ ffi (1.17.1-arm-linux-musl)
+ ffi (1.17.1-arm64-darwin)
+ ffi (1.17.1-x86-linux-gnu)
+ ffi (1.17.1-x86-linux-musl)
+ ffi (1.17.1-x86_64-darwin)
+ ffi (1.17.1-x86_64-linux-gnu)
+ ffi (1.17.1-x86_64-linux-musl)
forwardable-extended (2.6.0)
+ google-protobuf (4.29.3)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.29.3-aarch64-linux)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.29.3-arm64-darwin)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.29.3-x86-linux)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.29.3-x86_64-darwin)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.29.3-x86_64-linux)
+ bigdecimal
+ rake (>= 13)
http_parser.rb (0.8.0)
- i18n (1.10.0)
+ i18n (1.14.7)
concurrent-ruby (~> 1.0)
- jekyll (4.2.2)
+ jekyll (4.4.1)
addressable (~> 2.4)
+ base64 (~> 0.2)
colorator (~> 1.0)
+ csv (~> 3.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)
+ json (~> 2.6)
+ kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
- mercenary (~> 0.4.0)
+ mercenary (~> 0.3, >= 0.3.6)
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-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
- jekyll-sass-converter (2.2.0)
- sassc (> 2.0.1, < 3.0)
+ jekyll-sass-converter (3.1.0)
+ sass-embedded (~> 1.75)
jekyll-watch (2.2.1)
listen (~> 3.0)
- kramdown (2.3.2)
- rexml
+ json (2.10.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.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (4.0.7)
- rb-fsevent (0.11.1)
- rb-inotify (0.10.1)
+ public_suffix (6.0.1)
+ rake (13.2.1)
+ rb-fsevent (0.11.2)
+ rb-inotify (0.11.1)
ffi (~> 1.0)
- rexml (3.3.9)
- rouge (3.28.0)
+ rexml (3.4.1)
+ rouge (4.5.1)
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)
- webrick (1.8.2)
+ sass-embedded (1.85.0)
+ google-protobuf (~> 4.29)
+ rake (>= 13)
+ sass-embedded (1.85.0-aarch64-linux-android)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-aarch64-linux-gnu)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-aarch64-linux-musl)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-aarch64-mingw-ucrt)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-arm-linux-androideabi)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-arm-linux-gnueabihf)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-arm-linux-musleabihf)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-arm64-darwin)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-riscv64-linux-android)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-riscv64-linux-gnu)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-riscv64-linux-musl)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-x86_64-cygwin)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-x86_64-darwin)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-x86_64-linux-android)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-x86_64-linux-gnu)
+ google-protobuf (~> 4.29)
+ sass-embedded (1.85.0-x86_64-linux-musl)
+ google-protobuf (~> 4.29)
+ terminal-table (3.0.2)
+ unicode-display_width (>= 1.1.1, < 3)
+ unicode-display_width (2.6.0)
+ webrick (1.9.1)
PLATFORMS
- x86_64-linux
+ aarch64-linux
+ aarch64-linux-android
+ aarch64-linux-gnu
+ aarch64-linux-musl
+ aarch64-mingw-ucrt
+ 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
+ x86-linux-gnu
+ x86-linux-musl
+ x86_64-cygwin
+ x86_64-darwin
+ x86_64-linux-android
+ x86_64-linux-gnu
x86_64-linux-musl
DEPENDENCIES
jekyll (~> 4)
jekyll-redirect-from
- webrick (~> 1.8)
+ webrick (~> 1.9.1)
BUNDLED WITH
- 2.3.11
+ 2.5.22
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index b433050a2..c24866dad 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -1,5 +1,7 @@
/* Base */
+@use "mixins" as m;
+
* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -11,7 +13,7 @@ body {
color: #ddd;
background-color: #333;
border-top: 5px solid #937cb0;
- @include box-shadow(inset 0 3px 30px rgba(0,0,0,.3));
+ @include m.box-shadow(inset 0 3px 30px rgba(0,0,0,.3));
text-shadow: 0 1px 3px rgba(0,0,0,.5);
-webkit-font-feature-settings: "kern" 1;
-moz-font-feature-settings: "kern" 1;
@@ -68,17 +70,17 @@ nav {
margin-right: 10px;
a {
- @include border-radius(5px);
+ @include m.border-radius(5px);
font-weight: 900;
font-size: 14px;
padding: 0.5em 1em;
text-shadow: none;
text-transform: uppercase;
- @include transition(all .25s);
+ @include m.transition(all .25s);
&:hover {
background-color: #252525;
- @include box-shadow(inset 0 1px 3px rgba(0,0,0,.5), 0 1px 0
rgba(255,255,255,.1));
+ @include m.box-shadow(inset 0 1px 3px rgba(0,0,0,.5), 0 1px 0
rgba(255,255,255,.1));
text-shadow: 0 1px 3px rgba(0,0,0,.5);
}
}
@@ -88,7 +90,7 @@ nav {
a {
background-color: #937cb0;
color: #222;
- @include box-shadow(inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px
rgba(0,0,0,.5));
+ @include m.box-shadow(inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px
rgba(0,0,0,.5));
text-shadow: 0 1px 0 rgba(255,255,255,.3);
}
}
@@ -113,7 +115,7 @@ nav {
font-size: 14px;
font-weight: 900;
padding: 5px;
- @include border-radius(5px);
+ @include m.border-radius(5px);
}
li {
@@ -127,7 +129,7 @@ nav {
a {
background-color: #937cb0;
color: #222;
- @include box-shadow(inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px
rgba(0,0,0,.5));
+ @include m.box-shadow(inset 0 1px 0 rgba(255,255,255,.5), 0 1px 5px
rgba(0,0,0,.5));
text-shadow: 0 1px 0 rgba(255,255,255,.3);
}
}
@@ -142,7 +144,7 @@ nav {
left: 0.5em;
opacity: 0;
font-size: 0.8em;
- @include transition(opacity 0.2s ease-in-out 0.1s);
+ @include m.transition(opacity 0.2s ease-in-out 0.1s);
}
h2:hover .header-link,
h3:hover .header-link,
@@ -196,7 +198,7 @@ footer {
margin-left: 5px;
opacity: .8;
padding: 1px;
- @include transition(opacity .2s);
+ @include m.transition(opacity .2s);
}
}
@@ -230,7 +232,7 @@ footer {
background-color: #3F1F1F;
color: #fff;
margin: 60px 0;
- @include box-shadow(inset 0 3px 10px rgba(0,0,0,.4));
+ @include m.box-shadow(inset 0 3px 10px rgba(0,0,0,.4));
.content { padding: 0; }
@@ -279,8 +281,8 @@ footer {
text-align: center;
margin: 0 20px;
padding: 5px 0;
- @include border-radius(5px 5px 0 0);
- @include box-shadow(0 3px 10px rgba(0,0,0,.5));
+ @include m.border-radius(5px 5px 0 0);
+ @include m.box-shadow(0 3px 10px rgba(0,0,0,.5));
font: 400 16px/24px 'Helvetica Neue', Helvetica, Arial, sans-serif;
color: #444;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
@@ -300,8 +302,8 @@ footer {
text-shadow: none;
margin: 0 20px;
background-color: #171717;
- @include border-radius(0 0 5px 5px);
- @include box-shadow(0 5px 30px rgba(0,0,0,.3));
+ @include m.border-radius(0 0 5px 5px);
+ @include m.box-shadow(0 5px 30px rgba(0,0,0,.3));
}
.line {
@@ -314,7 +316,7 @@ footer {
.path {
color: #87ceeb;
- @include user-select(none);
+ @include m.user-select(none);
}
.prompt {
@@ -368,10 +370,10 @@ footer {
article {
background-color: #444;
- @include border-radius(10px);
+ @include m.border-radius(10px);
padding: 20px;
margin: 0 10px;
- @include box-shadow(0 3px 10px rgba(0,0,0,.1));
+ @include m.box-shadow(0 3px 10px rgba(0,0,0,.1));
font-size: 16px;
}
@@ -458,9 +460,9 @@ aside {
text-transform: uppercase;
font-weight: 700;
padding: 8px 12px 10px;
- @include border-radius(5px);
+ @include m.border-radius(5px);
/*border: 1px solid #333;*/
- @include box-shadow(0 1px 3px rgba(0,0,0,.3), inset 0 1px 1px
rgba(255,255,255,.5));
+ @include m.box-shadow(0 1px 3px rgba(0,0,0,.3), inset 0 1px 1px
rgba(255,255,255,.5));
background-color: #767676;
}
@@ -533,9 +535,9 @@ article h2:first-child { margin-top: 0; }
margin-left: -30px;
padding: 6px 10px 8px;
padding-left: 50px;
- @include border-radius(0 5px 5px 0);
+ @include m.border-radius(0 5px 5px 0);
position: relative;
- @include box-shadow(0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0
rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3));
+ @include m.box-shadow(0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0
rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3));
background-color: #9e2812;
background-image:
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllMjgxMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIH
[...]
background-image: -webkit-gradient(linear, left top, left bottom,
from(#9e2812), to(#6f0d0d));
@@ -576,7 +578,7 @@ article h2:first-child { margin-top: 0; }
}
.avatar {
- @include border-radius(3px);
+ @include m.border-radius(3px);
display: inline-block;
vertical-align: middle;
}
@@ -593,9 +595,9 @@ article h2:first-child { margin-top: 0; }
.news article + article {
margin-top: -10px;
- @include border-radius(0 0 10px 10px);
+ @include m.border-radius(0 0 10px 10px);
border-top: 1px solid #555;
- @include box-shadow(0 -1px 0 #2f2f2f);
+ @include m.box-shadow(0 -1px 0 #2f2f2f);
}
/* Code Highlighting */
@@ -623,8 +625,8 @@ h5 > code,
.note > code {
background-color: #2b2b2b;
color: #fff;
- @include border-radius(5px);
- @include box-shadow(inset 0 1px 10px rgba(0,0,0,.3),
+ @include m.border-radius(5px);
+ @include m.box-shadow(inset 0 1px 10px rgba(0,0,0,.3),
0 1px 0 rgba(255,255,255,.1),
0 -1px 0 rgba(0,0,0,.5));
}
@@ -651,7 +653,7 @@ h1, h2, h3, h4, h5, h6 { margin: 0; }
a {
color: #937cb0;
text-decoration: none;
- @include transition(all .25s);
+ @include m.transition(all .25s);
&:hover { color: #937cb0; }
}
@@ -709,13 +711,13 @@ table {
width: 100%;
background-color: #555;
margin: .5em 0;
- @include border-radius(5px);
- @include box-shadow(0 1px 3px rgba(0,0,0,.3));
+ @include m.border-radius(5px);
+ @include m.box-shadow(0 1px 3px rgba(0,0,0,.3));
}
thead {
- @include border-top-left-radius(5px);
- @include border-top-right-radius(5px);
+ @include m.border-top-left-radius(5px);
+ @include m.border-top-right-radius(5px);
color: #fff;
background-color: #3a3a3a;
background-image:
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzNhM2EzYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIH
[...]
@@ -728,14 +730,14 @@ thead {
th {
position: relative;
- @include box-shadow(inset 0 1px 0 rgba(255,255,255,.1));
+ @include m.box-shadow(inset 0 1px 0 rgba(255,255,255,.1));
&:first-child {
- @include border-top-left-radius(5px);
+ @include m.border-top-left-radius(5px);
}
&:last-child {
- @include border-top-right-radius(5px);
+ @include m.border-top-right-radius(5px);
}
}
}
@@ -755,7 +757,7 @@ th {
tbody td {
border-top: 1px solid #747474;
border-top: 1px solid rgba(0,0,0,.1);
- @include box-shadow(inset 0 1px 0 rgba(255,255,255,.1));
+ @include m.box-shadow(inset 0 1px 0 rgba(255,255,255,.1));
background:
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3Rv
[...]
background-image: -webkit-gradient(linear, left top, left bottom,
from(rgba(255,255,255,0.1)), to(rgba(255,255,255,0)));
background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%,
rgba(255,255,255,0) 100%);
@@ -799,9 +801,9 @@ code.output {
margin-left: -30px;
padding: 20px 20px 24px;
padding-left: 50px;
- @include border-radius(0 5px 5px 0);
+ @include m.border-radius(0 5px 5px 0);
position: relative;
- @include box-shadow(0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0
rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3));
+ @include m.box-shadow(0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0
rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3));
background-color: #7e6d42;
background-image:
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzdlNmQ0MiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIH
[...]
background-image: -webkit-gradient(linear, left top, left bottom,
from(#7e6d42), to(#5c4e35));
diff --git a/site/css/screen.scss b/site/css/screen.scss
index 2eff7f89d..f38e73daa 100644
--- a/site/css/screen.scss
+++ b/site/css/screen.scss
@@ -1,9 +1,9 @@
---
---
-@import "mixins";
-@import "normalize";
-@import "gridism";
-@import "pygments";
-@import "font-awesome";
-@import "style";
+@use "mixins" as m;
+@use "normalize";
+@use "gridism";
+@use "pygments";
+@use "font-awesome";
+@use "style";
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 291acd25a..a84e04e76 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -14,20 +14,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-version: '3'
services:
dev:
- image: jekyll/jekyll:4
- command: sh -c "./add-avatica-go-docs.sh; jekyll serve --watch
--force_polling"
+ image: ruby:3.3.7-slim-bullseye
+ working_dir: /root
+ command: sh -c "apt-get update && apt-get install -y build-essential git
libssl-dev zlib1g-dev ruby-dev bundler && ./add-avatica-go-docs.sh && bundle
install && bundle exec jekyll serve --host=0.0.0.0 --watch --force_polling"
ports:
- 4000:4000
volumes:
- - .:/srv/jekyll
+ - .:/root
build-site:
- image: jekyll/jekyll:4
- command: sh -c "./add-avatica-go-docs.sh; jekyll build"
+ image: ruby:3.3.7-slim-bullseye
+ 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 git libssl-dev zlib1g-dev ruby-dev bundler && cd
/home/jekyll && ./add-avatica-go-docs.sh && bundle install && bundle exec
jekyll build && chmod -R 777 ."
volumes:
- - .:/srv/jekyll
+ - .:/home/jekyll
generate-javadoc:
image: eclipse-temurin:8
working_dir: /usr/src/calcite-avatica
