-
Notifications
You must be signed in to change notification settings - Fork 363
Update to 0.12.5 #49
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Update to 0.12.5 #49
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
d4d241b
Update version to 0.12.5
joergschiller 5df81ab
Add binaries for Ubuntu Xenial
joergschiller 0173522
Refactor wrapper
joergschiller d0fbaa1
Add binaries for Ubuntu Trusty
joergschiller 668ef9a
Use `/etc/os-release`
joergschiller 359124a
Add binaries for CentOS 6/7
joergschiller 9dae039
Add binaries for Debian 8/9
joergschiller 9801ac6
Create README.md
joergschiller 8c62705
Add Docker for testing linux based distributions
joergschiller 217c46f
Add simple minitest
joergschiller af9ebe3
CentOS 6 doesn't have `/etc/os-release`
joergschiller 18c8da5
Update test_with_docker.rb
joergschiller 70d0fab
Need to build all containers before running tests
joergschiller 0c076ab
Compress binaries
joergschiller 67ccbba
Ignore uncompressed binaries which will be created during testing.
joergschiller f843ec5
Add test on local macos.
joergschiller 4e225b9
Update wkhtmltopdf
joergschiller f2d79ae
Use gzip instead of bzip2
joergschiller File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| FROM centos:6 | ||
|
|
||
| RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext | ||
|
|
||
| CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| FROM centos:7 | ||
|
|
||
| RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext | ||
|
|
||
| CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| FROM debian:8 | ||
|
|
||
| ENV DEBIAN_FRONTEND noninteractive | ||
|
|
||
| RUN apt-get update | ||
| RUN apt-get install -y ruby libjpeg62-turbo libpng12-0 libxrender1 libfontconfig1 libxext6 | ||
|
|
||
| CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| FROM debian:9 | ||
|
|
||
| ENV DEBIAN_FRONTEND noninteractive | ||
|
|
||
| RUN apt-get update | ||
| RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6 | ||
|
|
||
| CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| FROM ubuntu:14.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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| FROM ubuntu:16.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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| FROM ubuntu:18.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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,17 @@ | ||
| pkg/* | ||
| bin/wkhtmltopdf_centos_6_amd64 | ||
| bin/wkhtmltopdf_centos_7_amd64 | ||
| bin/wkhtmltopdf_debian_8_amd64 | ||
| bin/wkhtmltopdf_debian_9_amd64 | ||
| bin/wkhtmltopdf_macos_cocoa | ||
| bin/wkhtmltopdf_macos_carbon | ||
| bin/wkhtmltopdf_ubuntu_14.04_amd64 | ||
| bin/wkhtmltopdf_ubuntu_16.04_amd64 | ||
| bin/wkhtmltopdf_ubuntu_18.04_amd64 | ||
| bin/wkhtmltopdf_centos_6_i386 | ||
| bin/wkhtmltopdf_centos_7_i386 | ||
| bin/wkhtmltopdf_debian_8_i386 | ||
| bin/wkhtmltopdf_debian_9_i386 | ||
| bin/wkhtmltopdf_ubuntu_14.04_i386 | ||
| bin/wkhtmltopdf_ubuntu_16.04_i386 | ||
| bin/wkhtmltopdf_ubuntu_18.04_i386 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # wkhtmltopdf_binary_gem | ||
|
|
||
| ## Extracting binaries | ||
|
|
||
| Hints for extracting binaries from https://wkhtmltopdf.org/downloads.html (dpkg and rpm2cpio is available on Homebrew). | ||
|
|
||
| Debian/Ubuntu | ||
|
|
||
| dpkg -x wkhtmltox_0.12.5-1.trusty_amd64.deb . | ||
|
|
||
| CentOS | ||
|
|
||
| rpm2cpio wkhtmltox-0.12.5-1.centos7.x86_64.rpm | cpio -idmv | ||
|
|
||
| macOS | ||
|
|
||
| xar -xf wkhtmltox-0.12.5-1.macos-cocoa.pkg | ||
| cat Payload | gunzip -dc | cpio -i | ||
|
|
||
| ## Compression | ||
|
|
||
| Binaries should be compressed with `gzip --best` after extracting. The matching binary will be extracted on first | ||
| execution of `bin/wkhtmltopdf`. | ||
|
|
||
| ## Testing with Docker | ||
|
|
||
| Make sure you have Docker and Docker Compose installed (see https://docs.docker.com/compose/install/ for more | ||
| information). | ||
|
|
||
| There are Dockerfiles for the supported Linux based distributions under `.docker`. You can build them all with | ||
| `docker-compose build` and run each individually with e.g. `docker-compose run ubuntu_18.04`. | ||
|
|
||
| There also is a rudimentary minitest test that simply invokes `docker-compose run` for each distribution and | ||
| expects to see the output of `wkhtmltopdf --version`. Just run `rake` to run it. | ||
|
|
||
| You can clean up after testing with `docker-compose down --rmi all`. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,15 @@ | ||
| require 'rubygems' | ||
| require 'rubygems/package_task' | ||
| require 'rake/testtask' | ||
|
|
||
| spec = eval(File.new("wkhtmltopdf-binary.gemspec").readlines.join("\n")) | ||
| Gem::PackageTask.new(spec) do |pkg| | ||
| pkg.need_tar = true | ||
| end | ||
|
|
||
| Rake::TestTask.new do |t| | ||
| t.libs << 'test' | ||
| end | ||
|
|
||
| desc 'Run tests' | ||
| task default: :test |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.