Skip to content

Commit

Permalink
Merge pull request #178 from raphaelfeitoza/add_support_for_ubuntu_24
Browse files Browse the repository at this point in the history
Add support to ubuntu 24.04
  • Loading branch information
unixmonkey authored Aug 26, 2024
2 parents 8d40094 + dcbdd32 commit 9a9ce3d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
8 changes: 8 additions & 0 deletions .docker/Dockerfile-ubuntu_24.04
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update
RUN apt-get install -y ruby libjpeg8 libxrender1 libfontconfig1

CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
3 changes: 2 additions & 1 deletion bin/wkhtmltopdf
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ suffix = case RbConfig::CONFIG['host_os']

os = 'ubuntu_20.04' if os.start_with?('ubuntu_20.') ||
os.start_with?('linuxmint_20.')

os = 'ubuntu_21.10' if os.start_with?('ubuntu_21.') ||
os.start_with?('linuxmint_21.')

os = 'ubuntu_22.04' if os.start_with?('ubuntu_22.') ||
os.start_with?('ubuntu_24.') ||
os.start_with?('tuxedo_22.')

os = 'centos_6' if (os.start_with?('amzn_') && os != 'amzn_2') ||
Expand Down
4 changes: 4 additions & 0 deletions test/test_with_docker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ def test_with_ubuntu_22
test_on_x86 with: 'ubuntu_22.04'
end

def test_with_ubuntu_24
test_on_x86 with: 'ubuntu_24.04'
end

def test_with_archlinux
test_on_x86 with: 'archlinux'
end
Expand Down

0 comments on commit 9a9ce3d

Please sign in to comment.