This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 21e5470b3 ORC-1814: Use Ubuntu 24.04/Jekyll 4.3/Rouge 4.5 to generate 
website
21e5470b3 is described below

commit 21e5470b3ce47708d8c245e5ca0094eb1a2e39c1
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Wed Dec 11 10:15:45 2024 -0800

    ORC-1814: Use Ubuntu 24.04/Jekyll 4.3/Rouge 4.5 to generate website
    
    This PR aims to update website doc generation softwares.
    
    | SW  | BEFORE | AFTER |
    | - | - | - |
    | Ubuntu | 20.04 | 24.04 |
    | Ruby | 2 | 3 |
    | Jekyll | 3 | 4 |
    | Rouge | 3 | 4 |
    
    New image is published like the following.
    ```
    $ docker images
    REPOSITORY       TAG       IMAGE ID       CREATED         SIZE
    apache/orc-dev   site      8616e418af07   4 minutes ago   671MB
    ```
    
    To use the latest versions and avoid the deprecated or end-of-support SWs.
    
    Manual verification.
    
    ```
    $ cd site
    $ docker run -d --name orc-container -p 4000:4000 -v $PWD:/home/orc/site 
apache/orc-dev:site
    $ open http://localhost:4000/
    ```
    
    No.
    
    Closes #2083 from dongjoon-hyun/ORC-1814.
    
    Authored-by: Dongjoon Hyun <[email protected]>
    Signed-off-by: Dongjoon Hyun <[email protected]>
    (cherry picked from commit e6d62b3f32c8a0fdd10e093d57c7649fd482bcc0)
    Signed-off-by: Dongjoon Hyun <[email protected]>
---
 site/Dockerfile | 6 +++---
 site/Gemfile    | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/site/Dockerfile b/site/Dockerfile
index ff0a61397..67934e46c 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -17,7 +17,7 @@
 # ORC site builder
 #
 
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 LABEL maintainer="Apache ORC project <[email protected]>"
 
 RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
@@ -37,8 +37,8 @@ RUN gem install \
   liquid \
   listen \
   rouge
-RUN gem install jekyll -v 3.8.6
-RUN gem install github-pages
+RUN gem install jekyll
+RUN gem install -f github-pages
 
 RUN useradd -ms /bin/bash orc
 COPY . /home/orc/site
diff --git a/site/Gemfile b/site/Gemfile
index 1c529c9ce..200c6ce7b 100644
--- a/site/Gemfile
+++ b/site/Gemfile
@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-gem 'rouge'
-gem 'jekyll', "~> 3.8.3"
+gem 'jekyll', "~> 4.3"

Reply via email to