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.git
The following commit(s) were added to refs/heads/main by this push:
new 5c7ead4ba7 [CALCITE-6803] Publish website: error while trying to write
to /home/
5c7ead4ba7 is described below
commit 5c7ead4ba7f29dbf5412fb2fb551fef01f83ce62
Author: Hugh Pearse <[email protected]>
AuthorDate: Tue Jan 28 07:38:12 2025 -0600
[CALCITE-6803] Publish website: error while trying to write to /home/
---
.github/workflows/publish-non-release-website-updates.yml | 2 +-
.github/workflows/publish-website-on-release.yml | 2 +-
site/README.md | 2 +-
site/docker-compose.yml | 5 +----
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/publish-non-release-website-updates.yml
b/.github/workflows/publish-non-release-website-updates.yml
index b9e0601771..92eaf2de8a 100644
--- a/.github/workflows/publish-non-release-website-updates.yml
+++ b/.github/workflows/publish-non-release-website-updates.yml
@@ -56,7 +56,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: Push site
working-directory: site/target
env:
diff --git a/.github/workflows/publish-website-on-release.yml
b/.github/workflows/publish-website-on-release.yml
index 734fe1886b..8c9ae01cf4 100644
--- a/.github/workflows/publish-website-on-release.yml
+++ b/.github/workflows/publish-website-on-release.yml
@@ -44,7 +44,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/README.md b/site/README.md
index ff374cf59a..c85bf6bdf0 100644
--- a/site/README.md
+++ b/site/README.md
@@ -68,7 +68,7 @@ ### Setup your environment
### Build site
1. `cd site`
-2. `env JEKYLL_UID=$(id -u) JEKYLL_GID=$(id -g) docker compose run build-site`
+2. `env docker compose run build-site`
### Generate javadoc
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 593229e1b6..cae63c9e22 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -25,12 +25,9 @@ services:
- .:/root
build-site:
image: ruby:3.3.7-slim-bullseye
- command: sh -c "groupadd -g ${JEKYLL_GID:-1000} jekyll && useradd -u
${JEKYLL_UID:-1000} -g ${JEKYLL_GID:-1000} --create-home jekyll && rm -rf
/home/jekyll/.bundle /home/jekyll/Gemfile.lock /home/jekyll/.jekyll-cache &&
apt-get update && apt-get install -y build-essential libssl-dev zlib1g-dev
ruby-dev bundler && su jekyll -c 'cd ~ && bundle install && bundle exec jekyll
build'"
+ 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 && cd /home/jekyll &&
bundle install && bundle exec jekyll build && mkdir ./.git && chmod 777 ./*"
volumes:
- .:/home/jekyll
- environment:
- - JEKYLL_UID=${JEKYLL_UID}
- - JEKYLL_GID=${JEKYLL_GID}
generate-javadoc:
image: eclipse-temurin:19
working_dir: /usr/src/calcite
