-
Notifications
You must be signed in to change notification settings - Fork 4
OPS-3816 Update Jekyll #202
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jaameemoo
wants to merge
7
commits into
main
Choose a base branch
from
ops-3816-update-jekyll
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c84310f
Switch Jekyll Docker image to v4.2.2
jaameemoo 030bfe0
Normalize lock file
jaameemoo e29521e
Chown during copying
jaameemoo 2d98235
Remove dependency on forked Jekyll theme
jaameemoo 00b3a2f
Switch Docker image
jaameemoo 85d988f
Pin versions in Gemfile
jaameemoo e7b155e
Switch to slim base image
jaameemoo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| FROM jekyll/jekyll:3 | ||
| RUN gem install bundler -v 2.4.22 | ||
| FROM ruby:3.4-slim-trixie | ||
| RUN gem install bundler -v 2.6.9 | ||
| WORKDIR /srv/jekyll | ||
| COPY Gemfile Gemfile.lock ./ | ||
| RUN apt-get update && apt-get install -y --no-install-recommends build-essential git && rm -rf /var/lib/apt/lists/* | ||
| RUN bundle install | ||
| COPY . . | ||
| ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"] | ||
| ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,4 @@ | ||
| source "https://rubygems.org" | ||
| # Hello! This is where you manage which Jekyll version is used to run. | ||
| # When you want to use a different version, change it below, save the | ||
| # file and run `bundle install`. Run Jekyll with `bundle exec`, like so: | ||
| # | ||
| # bundle exec jekyll serve | ||
| # | ||
| # This will help ensure the proper Jekyll version is running. | ||
| # Happy Jekylling! | ||
| # gem "jekyll", "~> 4.1.1" | ||
| # This is the default theme for new Jekyll sites. You may change this to anything you like. | ||
| # gem "minima", "~> 2.5" | ||
| #gem "just-the-docs" | ||
| gem "jekyll-remote-theme" | ||
| gem "just-the-docs", github: "pdmosses/just-the-docs", branch: "combination-rec-nav" | ||
| # If you want to use GitHub Pages, remove the "gem "jekyll"" above and | ||
| # uncomment the line below. To upgrade, run `bundle update github-pages`. | ||
| gem "github-pages", group: :jekyll_plugins | ||
| # If you have any plugins, put them here! | ||
| group :jekyll_plugins do | ||
| gem "jekyll-feed", "~> 0.12" | ||
| end | ||
|
|
||
| # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem | ||
| # and associated library. | ||
| platforms :mingw, :x64_mingw, :mswin, :jruby do | ||
| gem "tzinfo", "~> 1.2" | ||
| gem "tzinfo-data" | ||
| end | ||
|
|
||
| # Performance-booster for watching directories on Windows | ||
| gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] | ||
|
|
||
|
|
||
| gem "logger", "~> 1.6", ">= 1.6.5" | ||
| gem "jekyll", "~> 4.4", ">= 4.4.1" | ||
| gem "just-the-docs", "~>0.10", ">= 0.10.1" | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think these were necessary to get the correct build, because legacy github pages build (which is what we currently use) only supports certain versions of jekyll. If you want to upgrade to jekyll 4.4, you have to switch to github actions (I think)
Have you tested this on github pages?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, this was only tested locally! Will look into it.