Merge branch 'master' into 176_fix_for_linux_mint_22

.docker/Dockerfile-ubuntu_24.04

@@ -0,0 +1,8 @@
+FROM ubuntu:24.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

bin/wkhtmltopdf

@@ -43,6 +43,7 @@ suffix = case RbConfig::CONFIG['host_os']
                                   os.start_with?('linuxmint_21.')
 
            os = 'ubuntu_22.04' if os.start_with?('ubuntu_22.') ||
+                                  os.start_with?('ubuntu_24.') ||
                                   os.start_with?('tuxedo_22.') ||
                                   os.start_with?('linuxmint_22')
 

test/test_with_docker.rb

@@ -57,6 +57,10 @@ def test_with_ubuntu_22
    test_on_x86 with: 'ubuntu_22.04'
   end
 
+  def test_with_ubuntu_24
+    test_on_x86 with: 'ubuntu_24.04'
+   end
+
   def test_with_archlinux
     test_on_x86 with: 'archlinux'
   end