Skip to content

Commit

Permalink
Add support debian 12 bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
willnet committed Nov 21, 2023
1 parent c20dd30 commit fb9e4ff
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .docker/Dockerfile-debian_12_arm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM --platform=arm64 debian:12

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
8 changes: 8 additions & 0 deletions .docker/Dockerfile-degian_12
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM debian:12

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
2 changes: 2 additions & 0 deletions bin/wkhtmltopdf
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ suffix = case RbConfig::CONFIG['host_os']

os = 'debian_11' if !os_based_on_debian_9 && os.start_with?('debian_11')

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

os = 'archlinux' if os.start_with?('arch_') ||
os.start_with?('manjaro_')

Expand Down
Binary file added bin/wkhtmltopdf_debian_12_amd64.gz
Binary file not shown.
Binary file added bin/wkhtmltopdf_debian_12_arm64.gz
Binary file not shown.
Binary file added bin/wkhtmltopdf_debian_12_i386.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 @@ -51,6 +51,13 @@ services:
volumes:
- .:/root/wkhtmltopdf_binary_gem

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

centos_6:
build:
context: .
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 @@ -37,6 +37,10 @@ def test_debian_11
test_on_x86_and_arm with: 'debian_11'
end

def test_debian_12
test_on_x86_and_arm with: 'debian_12'
end

def test_with_ubuntu_16
test_on_x86 with: 'ubuntu_16.04'
end
Expand Down

0 comments on commit fb9e4ff

Please sign in to comment.