Skip to content

Commit eec3a70

Browse files
authored
Merge pull request #192 from bruno-costanzo/patch-1
Update wkhtmltopdf to support Debian 13
2 parents d6a1956 + 180299a commit eec3a70

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

.docker/Dockerfile-debian_13

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM debian:13
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN apt-get update
6+
RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
7+
8+
CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

bin/wkhtmltopdf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ suffix = case RbConfig::CONFIG['host_os']
7272

7373
os = 'debian_12' if !os_based_on_debian_9 && os.start_with?('debian_12')
7474

75+
os = 'debian_12' if !os_based_on_debian_9 && os.start_with?('debian_13')
76+
7577
os = 'archlinux' if os.start_with?('arch_') ||
7678
os.start_with?('manjaro_')
7779

docker-compose.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
version: '3'
22

33
services:
4-
54
ubuntu_16.04:
65
build:
76
context: .
@@ -58,6 +57,13 @@ services:
5857
volumes:
5958
- .:/root/wkhtmltopdf_binary_gem
6059

60+
debian_13:
61+
build:
62+
context: .
63+
dockerfile: .docker/Dockerfile-debian_13
64+
volumes:
65+
- .:/root/wkhtmltopdf_binary_gem
66+
6167
centos_6:
6268
build:
6369
context: .

test/test_with_docker.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ def test_debian_12
4141
test_on_x86_and_arm with: 'debian_12'
4242
end
4343

44+
def test_debian_13
45+
test_on_x86 with: 'debian_13'
46+
end
47+
4448
def test_with_ubuntu_16
4549
test_on_x86 with: 'ubuntu_16.04'
4650
end

0 commit comments

Comments
 (0)