diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 2c2f50c4..028879a8 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -34,7 +34,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ github.repository }} - name: Build Docker Image and Push to Container Registry - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: ${{ github.event_name != 'pull_request' }} diff --git a/Dockerfile b/Dockerfile index 3caedbfe..6fe6a8df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,8 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 ENV LC_ALL en_US.UTF-8 +ENV BUNDLE_GEMFILE=/src/gh/pages-gem/Gemfile + WORKDIR /src/site CMD ["jekyll", "serve", "-H", "0.0.0.0", "-P", "4000"] diff --git a/Dockerfile.alpine b/Dockerfile.alpine index aea69e92..717b1b8e 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -17,6 +17,8 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 ENV LC_ALL en_US.UTF-8 +ENV BUNDLE_GEMFILE=/src/gh/pages-gem/Gemfile + WORKDIR /src/site CMD ["jekyll", "serve", "-H", "0.0.0.0", "-P", "4000"] diff --git a/github-pages.gemspec b/github-pages.gemspec index dacbb09f..faeb2b4c 100644 --- a/github-pages.gemspec +++ b/github-pages.gemspec @@ -25,8 +25,9 @@ Gem::Specification.new do |s| end s.add_dependency("mercenary", "~> 0.3") - s.add_dependency("nokogiri", ">= 1.13.6", "< 2.0") + s.add_dependency("nokogiri", ">= 1.16.2", "< 2.0") s.add_dependency("terminal-table", "~> 1.4") + s.add_dependency("webrick", "~> 1.8") s.add_development_dependency("jekyll_test_plugin_malicious", "~> 0.2") s.add_development_dependency("pry", "~> 0.10") s.add_development_dependency("rspec", "~> 3.3") diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 5d3f948d..52ffa371 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,13 +7,13 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.9.5", + "jekyll" => "3.10.0", "jekyll-sass-converter" => "1.5.2", # Converters "kramdown" => "2.4.0", "kramdown-parser-gfm" => "1.1.0", - "jekyll-commonmark-ghpages" => "0.4.0", + "jekyll-commonmark-ghpages" => "0.5.1", # Misc "liquid" => "4.0.4", diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index c69e2cda..6d381bad 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 231 + VERSION = 232 end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bf8614da..ef7e9e91 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -16,7 +16,7 @@ # Stub all GitHub API requests so they come back empty. config.before(:each) do - stub_request(:get, /api.github.com/) + stub_request(:get, /api\.github\.com/) .to_return(:status => 200, :body => "{}", :headers => {}) end end