From 180299af4fc29fbcf1bc78d21525449d19d26590 Mon Sep 17 00:00:00 2001 From: bruno-costanzo Date: Wed, 20 Aug 2025 05:48:02 +0000 Subject: [PATCH] Add Debian 13 support using Debian 12 binary --- .docker/Dockerfile-debian_13 | 8 ++++++++ bin/wkhtmltopdf | 2 ++ docker-compose.yml | 8 +++++++- test/test_with_docker.rb | 4 ++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .docker/Dockerfile-debian_13 diff --git a/.docker/Dockerfile-debian_13 b/.docker/Dockerfile-debian_13 new file mode 100644 index 0000000..822dead --- /dev/null +++ b/.docker/Dockerfile-debian_13 @@ -0,0 +1,8 @@ +FROM debian:13 + +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 diff --git a/bin/wkhtmltopdf b/bin/wkhtmltopdf index ba3da4b..2c00ad5 100755 --- a/bin/wkhtmltopdf +++ b/bin/wkhtmltopdf @@ -72,6 +72,8 @@ suffix = case RbConfig::CONFIG['host_os'] os = 'debian_12' if !os_based_on_debian_9 && os.start_with?('debian_12') + os = 'debian_12' if !os_based_on_debian_9 && os.start_with?('debian_13') + os = 'archlinux' if os.start_with?('arch_') || os.start_with?('manjaro_') diff --git a/docker-compose.yml b/docker-compose.yml index 1d00e48..dcdeed4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ version: '3' services: - ubuntu_16.04: build: context: . @@ -58,6 +57,13 @@ services: volumes: - .:/root/wkhtmltopdf_binary_gem + debian_13: + build: + context: . + dockerfile: .docker/Dockerfile-debian_13 + volumes: + - .:/root/wkhtmltopdf_binary_gem + centos_6: build: context: . diff --git a/test/test_with_docker.rb b/test/test_with_docker.rb index f72af65..4a0b7fc 100644 --- a/test/test_with_docker.rb +++ b/test/test_with_docker.rb @@ -41,6 +41,10 @@ def test_debian_12 test_on_x86_and_arm with: 'debian_12' end + def test_debian_13 + test_on_x86 with: 'debian_13' + end + def test_with_ubuntu_16 test_on_x86 with: 'ubuntu_16.04' end