Skip to content

Commit

Permalink
After checking how the deploy work, change deps fix approach: keep th…
Browse files Browse the repository at this point in the history
…e deps pre-3.x but make bundler old enough too
  • Loading branch information
Erno Kuusela committed Jan 9, 2024
1 parent ea3731f commit a9ef6d9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
FROM ruby:3.1
# 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: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ gem 'github-pages'

group :development do
gem 'compass'
gem 'webrick'
end
1 change: 0 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
webrick (1.8.1)
zeitwerk (2.6.6)

PLATFORMS
Expand Down
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 it - Github 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
2 changes: 1 addition & 1 deletion vagrant/makeitso.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source /etc/profile.d/rvm.sh
rvm install 2.7.3
rvm use 2.7.3
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

0 comments on commit a9ef6d9

Please sign in to comment.