Skip to content

Commit

Permalink
Merge branch 'master' into add-almalinux-support
Browse files Browse the repository at this point in the history
  • Loading branch information
unixmonkey authored May 9, 2024
2 parents 473a4ba + fb18a18 commit 139e81e
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .docker/Dockerfile-oraclelinux_8
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM oraclelinux:8

RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext

CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
10 changes: 7 additions & 3 deletions bin/wkhtmltopdf
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ suffix = case RbConfig::CONFIG['host_os']
os.start_with?('zorin')

os = 'ubuntu_20.04' if os.start_with?('ubuntu_20.') ||
os.start_with?('ubuntu_21.') ||
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?('linuxmint_21.') ||
os.start_with?('tuxedo_22.')

os = 'centos_6' if (os.start_with?('amzn_') && os != 'amzn_2') ||
Expand All @@ -50,7 +51,10 @@ suffix = case RbConfig::CONFIG['host_os']
os = 'centos_7' if (os.start_with?('amzn_2') && !os.start_with?('amzn_20')) ||
os.start_with?('rhel_7.')

os = 'centos_8' if os.start_with?('almalinux_8') || os.start_with?('rocky_8') || os.start_with?('rhel_8.')
os = 'centos_8' if os.start_with?('rocky_8') ||
os.start_with?('rhel_8.') ||
os.start_with?('ol_8.') ||
os.start_with?('almalinux_8')

os_based_on_debian_9 = os.start_with?('debian_9') ||
os.start_with?('deepin')
Expand Down
Binary file added bin/wkhtmltopdf_ubuntu_21.10_amd64.gz
Binary file not shown.
7 changes: 7 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ services:
volumes:
- .:/root/wkhtmltopdf_binary_gem

oraclelinux_8:
build:
context: .
dockerfile: .docker/Dockerfile-oraclelinux_8
volumes:
- .:/root/wkhtmltopdf_binary_gem

rockylinux_8:
build:
context: .
Expand Down
4 changes: 4 additions & 0 deletions wkhtmltopdf-binary.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Gem::Specification.new do |s|
s.files = Dir['bin/*']
s.executables << "wkhtmltopdf"
s.require_path = '.'
s.homepage = 'https://github.com/zakird/wkhtmltopdf_binary_gem'

spec.metadata['source_code_uri'] = spec.homepage
spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/master/CHANGELOG.md"

s.add_development_dependency "minitest"
s.add_development_dependency "rake"
Expand Down

0 comments on commit 139e81e

Please sign in to comment.