Skip to content
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

Ruby deps fix #508

Merged
merged 4 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.3
2.7.4
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
FROM ruby:2.7.3
# Following the version used by the GH action
# (https://github.com/actions/jekyll-build-pages/blob/main/Dockerfile)
FROM ruby:2.7.4

RUN mkdir /solita-blag
WORKDIR /solita-blag
VOLUME /solita-blag

ENV LANG C.UTF-8

RUN gem install bundler
RUN gem install bundler -v 2.4.22
ADD Gemfile /solita-blag
ADD Gemfile.lock /solita-blag
RUN bundle install

CMD ["bundle", "exec", "jekyll", "serve", "--watch", "--host", "0.0.0.0"]
EXPOSE 4000/tcp

1 change: 1 addition & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ PLATFORMS
DEPENDENCIES
compass
github-pages
webrick
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this needed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work. Resolved.


BUNDLED WITH
2.3.18
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ If you want to write a post, here's how:
7. Ask someone to review your post
8. Publish by merging the branch

## Understanding how the deploy works

There are no workflows in this repo for the deploy - Github has builtin Jekyll based workflows
as part of the Github Pages support. You can learn more about it at
https://docs.github.com/en/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll
or in the Actions run logs that show which actions are being invoked (to see eg Jekyll and Ruby versions involved).

## Running the site locally

### Option A: Running the site in a container (recommended)
Expand Down Expand Up @@ -72,7 +79,7 @@ If you want to write a post, here's how:
### Option C: Running with local Ruby installation

1. Navigate to your working directory and make sure you are running a comatible version of Ruby with `ruby -v`
2. `gem install bundler`
2. `gem install bundler -v 2.4.22`
3. `bundle install`
4. `bundle exec jekyll serve --watch`
5. The blog should now be live at [localhost:4000](http://localhost:4000)
Expand Down
6 changes: 3 additions & 3 deletions vagrant/makeitso.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
curl -sSL https://rvm.io/mpapis.asc | sudo gpg2 --import -
curl -L https://get.rvm.io | bash -s stable
source /etc/profile.d/rvm.sh
rvm install 2.7.3
rvm use 2.7.3
rvm install 2.7.4
rvm use 2.7.4
iptables -F
gem install bundler
gem install bundler -v 2.4.22
cd /env
bundle install
bundle exec jekyll serve --watch --host 0.0.0.0