Merge branch 'master' into amazon-linux-2023

.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

@@ -38,12 +38,14 @@ suffix = case RbConfig::CONFIG['host_os']
 
            os = 'ubuntu_20.04' if os.start_with?('ubuntu_20.') ||
                                   os.start_with?('linuxmint_20.')
-           
+
 	         os = 'ubuntu_21.10' if os.start_with?('ubuntu_21.') ||
                                   os.start_with?('linuxmint_21.')
 
            os = 'ubuntu_22.04' if os.start_with?('ubuntu_22.') ||
-                                  os.start_with?('tuxedo_22.')
+                                  os.start_with?('ubuntu_24.') ||
+                                  os.start_with?('tuxedo_22.') ||
+                                  os.start_with?('linuxmint_22')
 
            os = 'centos_6' if (os.start_with?('amzn_') && os != 'amzn_2' && os != 'amzn_2023') ||
                               (os.empty? && File.read('/etc/centos-release').start_with?('CentOS release 6'))
@@ -54,6 +56,7 @@ suffix = case RbConfig::CONFIG['host_os']
            os = 'centos_8' if os.start_with?('rocky_8') ||
                               os.start_with?('rhel_8.') ||
                               os.start_with?('ol_8.') ||
+                              os.start_with?('alinux_') ||
                               os == 'amzn_2023'
 
            os_based_on_debian_9 = os.start_with?('debian_9') ||

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