diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..288ea55 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +# Use version of Ruby from Github pages: https://pages.github.com/versions/ +FROM ruby:2.7-alpine + +WORKDIR /srv/jekyll + +RUN apk update && apk add --no-cache build-base gcc cmake git bash + +# Use version of Bundler from Github pages: https://pages.github.com/versions/ +RUN gem install --user-install bundler -v "2.3.10" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 726d0b0..c1a9755 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,7 +14,7 @@ GEM addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) coffee-script (2.4.1) coffee-script-source execjs @@ -23,10 +23,9 @@ GEM commonmarker (0.23.10) concurrent-ruby (1.2.3) connection_pool (2.4.1) - dnsruby (1.70.0) + dnsruby (1.71.0) simpleidn (~> 0.2.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -34,10 +33,11 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.9.1) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) - net-http + faraday (2.8.1) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) ffi (1.16.3) forwardable-extended (2.6.0) gemoji (4.1.0) @@ -96,7 +96,7 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) jekyll (3.9.5) addressable (~> 2.4) @@ -215,19 +215,13 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.8.5) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.22.2) + minitest (5.22.3) mutex_m (0.2.0) - net-http (0.4.1) - uri - nokogiri (1.16.2) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.15.6-aarch64-linux) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) @@ -264,11 +258,9 @@ GEM unf_ext unf_ext (0.0.9.1) unicode-display_width (1.8.0) - uri (0.13.0) PLATFORMS - ruby - x86_64-linux + aarch64-linux-musl DEPENDENCIES github-pages (= 231) diff --git a/docker-compose.yml b/docker-compose.yml index abdb2bb..7c0fe2d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.2' services: jekyll: - image: jekyll/jekyll:4.2.0 + build: ./ environment: - JEKYLL_ENV=development # Frustratingly, Docker has problems with inotify: https://github.com/jekyll/jekyll-watch/issues/17