Skip to content

Commit

Permalink
Update to Jekyll v4.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
JV-conseil committed Jan 4, 2024
1 parent aa8bff5 commit 347fcc7
Show file tree
Hide file tree
Showing 18 changed files with 359 additions and 327 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/jekyll-docker-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Jekyll Builder for GitHub Pages (Action)
# See <https://github.com/marketplace/actions/jekyll-builder-for-github-pages>
# Copyright (c) 2019-2023 JV-conseil, All rights reserved
name: Deploy Jekyll v4.3.2 to GitHub Pages (Docker)
name: Deploy Jekyll v4.3.3 to GitHub Pages (Docker)

on:
# Runs on pushes targeting the default branch
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source "https://rubygems.org"
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
# gem "jekyll", "~> 3.9.3"
gem "jekyll", "~> 4.3.2"
gem "jekyll", "~> 4.3.3"

# IMPORTANT: The followign gem is used to compile math formulas to
# KaTeX during site building.
Expand Down
66 changes: 56 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bigdecimal (3.1.4)
bigdecimal (3.1.5)
colorator (1.1.0)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
Expand All @@ -26,7 +26,7 @@ GEM
http_parser.rb (~> 0)
eventmachine (1.2.7)
execjs (2.9.1)
faraday (2.7.12)
faraday (2.8.1)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
Expand All @@ -36,14 +36,19 @@ GEM
ffi (1.16.3)
forwardable-extended (2.6.0)
gemoji (4.1.0)
google-protobuf (3.25.1)
google-protobuf (3.25.1-aarch64-linux)
google-protobuf (3.25.1-arm64-darwin)
google-protobuf (3.25.1-x86-linux)
google-protobuf (3.25.1-x86_64-darwin)
google-protobuf (3.25.1-x86_64-linux)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.2)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand Down Expand Up @@ -114,7 +119,17 @@ GEM
mercenary (0.4.0)
minitest (5.20.0)
mutex_m (0.2.0)
nokogiri (1.15.5-arm64-darwin)
nokogiri (1.16.0-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.0-arm-linux)
racc (~> 1.4)
nokogiri (1.16.0-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.0-x86-linux)
racc (~> 1.4)
nokogiri (1.16.0-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.0-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
Expand All @@ -128,8 +143,26 @@ GEM
rouge (4.2.0)
ruby2_keywords (0.0.5)
safe_yaml (1.0.5)
sass-embedded (1.69.5-arm64-darwin)
google-protobuf (~> 3.23)
sass-embedded (1.69.7-aarch64-linux-gnu)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-aarch64-linux-musl)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-arm-linux-gnueabihf)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-arm-linux-musleabihf)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-arm64-darwin)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-x86-linux-gnu)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-x86-linux-musl)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-x86_64-darwin)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-x86_64-linux-gnu)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-x86_64-linux-musl)
google-protobuf (~> 3.25)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tzinfo (2.0.6)
Expand All @@ -139,12 +172,25 @@ GEM
webrick (1.8.1)

PLATFORMS
arm64-darwin-21
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux
arm-linux-gnueabihf
arm-linux-musleabihf
arm64-darwin
x86-linux
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
duktape
faraday-retry (~> 2.2.0)
jekyll (~> 4.3.2)
jekyll (~> 4.3.3)
jekyll-avatar (~> 0.8.0)
jekyll-compose
jekyll-default-layout
Expand All @@ -167,4 +213,4 @@ DEPENDENCIES
wdm (~> 0.1.0)

BUNDLED WITH
2.4.22
2.5.4
14 changes: 7 additions & 7 deletions _posts/2023-08-28-jekyll-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: Jekyll Docker
image:
path: /assets/posts/2023-08-28-jekyll-docker.png
description: >
Docker image to deploy Jekyll v4.3.2 on GitHub Pages
Docker image to deploy Jekyll v4.3.3 on GitHub Pages
# hide_description: true
category: projects
tag: [docker, jekyll, ruby]
Expand Down Expand Up @@ -41,7 +41,7 @@ The builder image (`jvconseil/jekyll-docker`) comes with extra stuff that is not
#### Usage

```sh
export JEKYLL_VERSION=4.3.2
export JEKYLL_VERSION=4.3.3
docker run --rm \
--volume="$PWD:/srv/jekyll:Z" \
-it jvconseil/jekyll-docker:$JEKYLL_VERSION \
Expand All @@ -55,7 +55,7 @@ The standard images (`jvconseil/jekyll`) include a default set of "dev" packages
#### Usage

```sh
export JEKYLL_VERSION=4.3.2
export JEKYLL_VERSION=4.3.3
docker run --rm \
--volume="$PWD:/srv/jekyll:Z" \
-it jvconseil/jekyll:$JEKYLL_VERSION \
Expand Down Expand Up @@ -91,7 +91,7 @@ The minimal image (`jvconseil/jekyll-minimal`) skips all the extra gems, all the
***You will need to provide a `.apk` file if you intend to use anything like Nokogiri or otherwise, we do not install any development headers or dependencies so C based gems will fail to install.***

```sh
export JEKYLL_VERSION=4.3.2
export JEKYLL_VERSION=4.3.3
docker run --rm \
--volume="$PWD:/srv/jekyll:Z" \
-it jvconseil/jekyll-minimal:$JEKYLL_VERSION \
Expand Down Expand Up @@ -122,14 +122,14 @@ docker run --rm \

## Dependencies

Jekyll Docker will attempt to install any dependencies that you list inside of your `Gemfile`, matching the versions you have in your `Gemfile.lock`, including Jekyll if you have a version that does not match the version of the image you are using (you should be doing `gem "jekyll", "~> 4.3.2"` so that minor versions are installed if you use say image tag "3.7.3").
Jekyll Docker will attempt to install any dependencies that you list inside of your `Gemfile`, matching the versions you have in your `Gemfile.lock`, including Jekyll if you have a version that does not match the version of the image you are using (you should be doing `gem "jekyll", "~> 4.3.3"` so that minor versions are installed if you use say image tag "3.7.3").

### Updating

If you provide a `Gemfile` and would like to update your `Gemfile.lock` you can run

```sh
export JEKYLL_VERSION=4.3.2
export JEKYLL_VERSION=4.3.3
docker run --rm \
--volume="$PWD:/srv/jekyll:Z" \
-it jvconseil/jekyll:$JEKYLL_VERSION \
Expand All @@ -147,7 +147,7 @@ You can enable caching in Jekyll Docker by using a `docker --volume` that points
### Usage

```sh
export JEKYLL_VERSION=4.3.2
export JEKYLL_VERSION=4.3.3
docker run --rm \
--volume="$PWD:/srv/jekyll:Z" \
--volume="$PWD/vendor/bundle:/usr/local/bundle:Z" \
Expand Down
Loading

0 comments on commit 347fcc7

Please sign in to comment.