Skip to content

Commit

Permalink
Update nokogiri to 1.18.3
Browse files Browse the repository at this point in the history
See: https://github.com/sparklemotion/nokogiri/releases/tag/v1.18.0

- required for ruby 3.4 compatibility
- add more platforms to lockfile to support
  docker build process, due to changes
  in the nokogiri native gem setup where
  -musl and -gnu linux platforms are no longer
  interchangeable
- bundler >= 2.5.6 required according to Nokogiri release
  notes, so updated to current latest version (2.6.5)
  • Loading branch information
smartygus committed Feb 21, 2025
1 parent 6f29d4e commit f012381
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY lib/kamal/version.rb /kamal/lib/kamal/version.rb
# Install system dependencies
RUN apk add --no-cache build-base git docker openrc openssh-client-default yaml-dev \
&& rc-update add docker boot \
&& gem install bundler --version=2.4.3 \
&& gem install bundler --version=2.6.5 \
&& bundle install

# Copy the rest of our application code into the container.
Expand Down
16 changes: 10 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ GEM
ast (2.4.2)
base64 (0.2.0)
bcrypt_pbkdf (1.1.1)
bcrypt_pbkdf (1.1.1-arm64-darwin)
bcrypt_pbkdf (1.1.1-x86_64-darwin)
benchmark (0.4.0)
bigdecimal (3.1.8)
builder (3.3.0)
Expand Down Expand Up @@ -84,11 +82,15 @@ GEM
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
net-ssh (7.3.0)
nokogiri (1.17.2-arm64-darwin)
nokogiri (1.18.3-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.17.2-x86_64-darwin)
nokogiri (1.18.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.17.2-x86_64-linux)
nokogiri (1.18.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.3-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.3-x86_64-linux-musl)
racc (~> 1.4)
ostruct (0.6.1)
parallel (1.26.3)
Expand Down Expand Up @@ -177,9 +179,11 @@ GEM
zeitwerk (2.7.1)

PLATFORMS
aarch64-linux-musl
arm64-darwin
x86_64-darwin
x86_64-linux
x86_64-linux-musl

DEPENDENCIES
debug
Expand All @@ -189,4 +193,4 @@ DEPENDENCIES
rubocop-rails-omakase

BUNDLED WITH
2.4.3
2.6.5

0 comments on commit f012381

Please sign in to comment.