This is an automated email from the ASF dual-hosted git repository. jky pushed a commit to branch update_ruby in repository https://gitbox.apache.org/repos/asf/flagon.git
commit e2f089e62b6628f470ad854dee4cfb00cc118faf Author: Jason Young <[email protected]> AuthorDate: Thu Nov 30 15:54:53 2023 -0500 Change docker base image and update ruby --- site/Dockerfile | 6 ++-- site/Gemfile | 4 +-- site/Gemfile.lock | 82 +++++++++++++++++++++++++++++++++++-------------------- site/README.md | 4 +-- 4 files changed, 60 insertions(+), 36 deletions(-) diff --git a/site/Dockerfile b/site/Dockerfile index d5755e2..de73bae 100644 --- a/site/Dockerfile +++ b/site/Dockerfile @@ -1,5 +1,5 @@ -FROM starefossen/ruby-node -MAINTAINER Joshua Poore <[email protected]> +FROM phusion/passenger-full +LABEL org.opencontainers.image.authors="[email protected]" # Cache bundle COPY Gemfile* /tmp/ @@ -19,7 +19,7 @@ WORKDIR $app ADD . $app # Jekyll buld -RUN jekyll build +RUN bundle exec jekyll build WORKDIR $app/_site diff --git a/site/Gemfile b/site/Gemfile index 3aed462..3a97c3c 100644 --- a/site/Gemfile +++ b/site/Gemfile @@ -9,7 +9,7 @@ ruby RUBY_VERSION # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "3.6.3" +gem 'jekyll', '~> 4.3', '>= 4.3.2' # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. @@ -17,5 +17,5 @@ gem "jekyll", "3.6.3" # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" + gem 'jekyll-feed', '~> 0.17.0' end diff --git a/site/Gemfile.lock b/site/Gemfile.lock index d65e7b9..1377be2 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -1,54 +1,78 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) - ffi (1.11.1) + concurrent-ruby (1.2.2) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + eventmachine (1.2.7) + ffi (1.16.3) forwardable-extended (2.6.0) - jekyll (3.6.3) + google-protobuf (3.23.4) + http_parser.rb (0.8.0) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + jekyll (4.3.2) addressable (~> 2.4) colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.14) + em-websocket (~> 0.5) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) + jekyll-watch (~> 2.0) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (>= 1.7, < 3) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - jekyll-feed (0.8.0) - jekyll (~> 3.3) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-watch (1.5.1) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-feed (0.17.0) + jekyll (>= 3.7, < 5.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) + jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) - liquid (4.0.3) - listen (3.2.0) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.1) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + public_suffix (5.0.4) + rake (13.1.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) - rouge (2.2.1) + rexml (3.2.6) + rouge (3.30.0) safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sass-embedded (1.58.3) + google-protobuf (~> 3.21) + rake (>= 10.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.5.0) + webrick (1.8.1) PLATFORMS ruby DEPENDENCIES - jekyll (= 3.6.3) - jekyll-feed (~> 0.6) + jekyll (~> 4.3, >= 4.3.2) + jekyll-feed (~> 0.17.0) + +RUBY VERSION + ruby 2.6.10p210 BUNDLED WITH - 1.11.2 + 2.4.22 diff --git a/site/README.md b/site/README.md index 8a8edd2..75614f4 100644 --- a/site/README.md +++ b/site/README.md @@ -8,12 +8,12 @@ How to Build and Deploy Site ``` 3. Deploy site on localhost:8000 ``` - docker run -p 8000:8000 -it flagon:site python -m SimpleHTTPServer + docker run -p 8000:8000 -it flagon:site python -m http.server ``` 4. (Optional): To update the site, can copy the files from the container to `_site`. ``` # First grab container id - CID=$(docker create -p 8000:8000 -it flagon:site python -m SimpleHTTPServer) + CID=$(docker create -p 8000:8000 -it flagon:site python -m http.server) # Reference container id to grab built contents docker cp $CID:/app/_site . ```
