Support Ubuntu 24

.docker/Dockerfile-almalinux_8

@@ -0,0 +1,5 @@
+FROM almalinux/almalinux:8
+
+RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
+
+CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.docker/Dockerfile-archlinux

@@ -1,8 +1,7 @@
-FROM archlinux:latest
+FROM archlinux
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN pacman -Sy --noconfirm \
-  ruby fontconfig freetype2 libjpeg libpng libxext libxrender
+RUN pacman -Sy --noconfirm ruby fontconfig freetype2 libjpeg libpng libxext libxrender openssl-1.1
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.docker/Dockerfile-centos_6

@@ -1,5 +1,9 @@
 FROM centos:6
 
-RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
+RUN rm -f /etc/yum.repos.d/CentOS-Base.repo && \
+    sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/CentOS-Vault.repo && \
+    yum clean all && \
+    yum update -y && \
+    yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.docker/Dockerfile-centos_8

@@ -1,5 +1,20 @@
 FROM centos:8
 
+# https://centos.org/centos-stream/#centos-stream-8
+#  Replace mirror
+RUN find /etc/yum.repos.d -type f -exec sed -i 's/mirrorlist=http:\/\/mirrorlist.centos.org/\#mirrorlist=http:\/\/mirrorlist.centos.org/g' {} \;
+RUN find /etc/yum.repos.d -type f -exec sed -i 's/\#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g' {} \;
+RUN dnf update -y
+
+#  Swap versions
+RUN dnf swap centos-linux-repos centos-stream-repos -y
+RUN dnf update -y
+RUN dnf install centos-release-stream -y 
+RUN dnf swap centos-{linux,stream}-repos -y 
+
+# Sync
+RUN dnf distro-sync -y
+
 RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.docker/Dockerfile-debian_10_arm

@@ -0,0 +1,8 @@
+FROM --platform=arm64 debian:10
+
+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

.docker/Dockerfile-debian_11

@@ -0,0 +1,8 @@
+FROM debian:11
+
+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

.docker/Dockerfile-debian_11_arm

@@ -0,0 +1,8 @@
+FROM --platform=arm64 debian:11
+
+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

.docker/Dockerfile-debian_12

@@ -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

.docker/Dockerfile-debian_12_arm

@@ -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

.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

.docker/Dockerfile-debian_9

@@ -2,7 +2,12 @@ FROM debian:9
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update
+RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list
+
+RUN apt-get -o Acquire::Check-Valid-Until=false update && \
+    apt-get -o Acquire::AllowInsecureRepositories=true update
+
 RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.docker/Dockerfile-debian_9_arm

@@ -0,0 +1,13 @@
+FROM --platform=arm64 debian:9
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main contrib non-free" >> /etc/apt/sources.list
+
+RUN apt-get -o Acquire::Check-Valid-Until=false update && \
+    apt-get -o Acquire::AllowInsecureRepositories=true update
+
+RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
+
+CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.docker/Dockerfile-oraclelinux_8

@@ -0,0 +1,5 @@
+FROM oraclelinux:8
+
+RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
+
+CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.docker/Dockerfile-rockylinux_8

@@ -0,0 +1,5 @@
+FROM rockylinux/rockylinux:8
+
+RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
+
+CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version

.docker/Dockerfile-deepin → .docker/Dockerfile-ubuntu_24.04

@@ -1,4 +1,4 @@
-FROM deepin/deepin-core:latest
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND noninteractive
 

.gitignore

@@ -1,10 +1,24 @@
 .DS_Store
 pkg/*
+Gemfile.lock
+bin/wkhtmltopdf_archlinux_amd64
 bin/wkhtmltopdf_centos_6_amd64
+bin/wkhtmltopdf_centos_6_i386
 bin/wkhtmltopdf_centos_7_amd64
+bin/wkhtmltopdf_centos_7_i386
 bin/wkhtmltopdf_centos_8_amd64
 bin/wkhtmltopdf_debian_9_amd64
+bin/wkhtmltopdf_debian_9_arm64
+bin/wkhtmltopdf_debian_9_i386
 bin/wkhtmltopdf_debian_10_amd64
+bin/wkhtmltopdf_debian_10_arm64
+bin/wkhtmltopdf_debian_10_i386
+bin/wkhtmltopdf_debian_11_amd64
+bin/wkhtmltopdf_debian_11_arm64
+bin/wkhtmltopdf_debian_11_i386
+bin/wkhtmltopdf_debian_12_amd64
+bin/wkhtmltopdf_debian_12_arm64
+bin/wkhtmltopdf_debian_12_i386
 bin/wkhtmltopdf_macos_cocoa
 bin/wkhtmltopdf_ubuntu_16.04_amd64
 bin/wkhtmltopdf_ubuntu_18.04_amd64
@@ -15,5 +29,10 @@ bin/wkhtmltopdf_centos_7_i386
 bin/wkhtmltopdf_debian_9_i386
 bin/wkhtmltopdf_debian_10_i386
 bin/wkhtmltopdf_ubuntu_16.04_i386
+bin/wkhtmltopdf_ubuntu_18.04_amd64
 bin/wkhtmltopdf_ubuntu_18.04_i386
-bin/wkhtmltopdf_archlinux_amd64
+bin/wkhtmltopdf_ubuntu_20.04_amd64
+bin/wkhtmltopdf_ubuntu_20.04_arm64
+bin/wkhtmltopdf_ubuntu_21.10_amd64
+bin/wkhtmltopdf_ubuntu_22.04_amd64
+bin/wkhtmltopdf_ubuntu_22.04_arm64

CHANGELOG → CHANGELOG.md

@@ -1,3 +1,27 @@
+# 0.12.6.10 (published to https://rubygems.pkg.github.com/mycase)
+
+- Add support for Debian 13 (with Debian 12 binaries)
+
+# 0.12.6.9
+
+- Add support to ubuntu 22.04 and 24.04 in arm64
+- Add support for KDE Neon 22.04 & 24.04 (Ubuntu derivative)
+
+# 0.12.6.8
+
+- Add support for Ubuntu 24.04 using the Ubuntu 22.04 binary
+- Add support for Linux Mint 22 using the Ubuntu 22.04 binary
+- Add support for Alibaba Cloud Linux using the CentOS 8 binary
+- Add support for AlmaLinux using the CentOS 8 binary
+- Fix Amazon Linux 2023 support using the CentOS binaries
+
+# 0.12.6.7
+
+- Setup of GitHub action test automation for Linux/MacOS builds
+- Add URLs to gemspec for inclusion on Rubygems.org
+- Add support for several new Linux binaries for Debian, Centos, Ubuntu, Mint, Oracle, Tuxedo
+- Add support for several arm64 Linux binaries
+
 # 0.12.6.5.slim5 (published to https://rubygems.pkg.github.com/mycase)
 
 * Add binary to support Ubuntu 18.04 on amd64
@@ -90,4 +114,3 @@ Update MacOS `wkhtmltopdf` binary to 0.9.9
 
 # 0.9.9
 Update `wkhtmltopdf` binaries with version 0.9.9
-

Gemfile

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+gemspec

README.md

@@ -51,15 +51,26 @@ macOS
 Binaries should be compressed with `gzip --best` after extracting. The matching binary will be extracted on first
 execution of `bin/wkhtmltopdf`.
 
-## Testing with Docker
+Hints for compressing binaries
 
-Make sure you have Docker and Docker Compose installed (see https://docs.docker.com/compose/install/ for more
-information).
+Debian/Ubuntu
+    user/local/bin refers to the extracted binaries directory
+    gzip --best -c usr/local/bin/wkhtmltopdf > wkhtmltopdf_ubuntu_22.04.amd64.gz
+
+## Testing
 
-There are Dockerfiles for the supported Linux based distributions under `.docker`. You can build them all with
-`docker-compose build` and run each individually with e.g. `docker-compose run ubuntu_18.04`.
+To execute gem tests locally, install in your OS:
 
-There also is a rudimentary minitest test that simply invokes `docker-compose run` for each distribution and
-expects to see the output of `wkhtmltopdf --version`. Just run `rake` to run it.
+- Docker
+- Docker compose
+- Ruby
+- Bundler
 
-You can clean up after testing with `docker-compose down --rmi all`.
+Then, execute the commands below:
+
+```bash
+git clone https://github.com/zakird/wkhtmltopdf_binary_gem
+cd wkhtmltopdf_binary_gem/
+bundle install
+bundle exec rake
+```

bin/wkhtmltopdf

@@ -10,35 +10,62 @@
 require 'rbconfig'
 require 'zlib'
 
+def architecture
+  case RbConfig::CONFIG['host_cpu']
+  when *%w[arm64 aarch64 arch64]
+    'arm64'
+  when 'x86_64'
+    'amd64'
+  else
+    'i386'
+  end
+end
+
 suffix = case RbConfig::CONFIG['host_os']
          when /linux/
            os = `. /etc/os-release 2> /dev/null && echo ${ID}_${VERSION_ID}`.strip
 
-           os_based_on_ubuntu_16_04 = os.start_with?('ubuntu_16.') || os.start_with?('ubuntu_17.')
-           os = 'ubuntu_16.04' if os_based_on_ubuntu_16_04
+           os = 'ubuntu_16.04' if os.start_with?('ubuntu_16.') ||
+                                  os.start_with?('ubuntu_17.') ||
+                                  os.start_with?('linuxmint_18.')
 
-           os_based_on_ubuntu_18_04 = os.start_with?('ubuntu_18.') || os.start_with?('ubuntu_19.') || os.start_with?('elementary') || os.start_with?('linuxmint') || os.start_with?('pop') || os.start_with?('zorin')
-           os = 'ubuntu_18.04' if os_based_on_ubuntu_18_04
+           os = 'ubuntu_18.04' if os.start_with?('ubuntu_18.') ||
+                                  os.start_with?('ubuntu_19.') ||
+                                  os.start_with?('elementary') ||
+                                  os.start_with?('linuxmint_19.') ||
+                                  os.start_with?('pop') ||
+                                  os.start_with?('zorin')
 
-           os_based_on_ubuntu_20_04 = os.start_with?('ubuntu_20.')
-           os = 'ubuntu_20.04' if os_based_on_ubuntu_20_04
+           os = 'ubuntu_20.04' if os.start_with?('ubuntu_20.') ||
+                                  os.start_with?('linuxmint_20.')
 
-           os = 'ubuntu_22.04' if os.start_with?('ubuntu_22.')
+           os = 'ubuntu_22.04' if os.start_with?('ubuntu_22.') ||
+                                  os.start_with?('ubuntu_24.') ||
+                                  os.start_with?('tuxedo_22.') ||
+                                  os.start_with?('neon_24.') ||
+                                  os.start_with?('neon_22.') ||
+                                  os.start_with?('linuxmint_22')
 
-           os = 'centos_6' if (os.start_with?('amzn_') && os != 'amzn_2') ||
+           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'))
 
-           os_based_on_centos_7 = os.start_with?('amzn_2')
-           os = 'centos_7' if os_based_on_centos_7
+           os = 'centos_7' if (os.start_with?('amzn_2') && !os.start_with?('amzn_20')) ||
+                              os.start_with?('rhel_7.')
+
+           os = 'centos_8' if os.start_with?('rocky_8') ||
+                              os.start_with?('rhel_8.') ||
+                              os.start_with?('ol_8.') ||
+                              os.start_with?('almalinux_8') ||
+                              os.start_with?('alinux_') ||
+                              os == 'amzn_2023'
 
-           os_based_on_debian_9 = (/(debian_9|deepin)/ =~ os)
+           os_based_on_debian_9 = os.start_with?('debian_9') ||
+                                  os.start_with?('deepin')
            os = 'debian_9' if os_based_on_debian_9
 
-           os_based_on_debian = !os_based_on_debian_9 && os.start_with?('debian')
-           os = 'debian_10' if os_based_on_debian
+           os = 'debian_10' if !os_based_on_debian_9 && os.start_with?('debian_10')
 
-           os_based_on_archlinux = os.start_with?('arch_') || os.start_with?('manjaro_')
-           os = 'archlinux' if os_based_on_archlinux
+           os = 'debian_11' if !os_based_on_debian_9 && os.start_with?('debian_11')
 
            os_based_on_alpine = os.start_with?('alpine_')
            os = 'alpine' if os_based_on_alpine
@@ -48,8 +75,14 @@ suffix = case RbConfig::CONFIG['host_os']
            # We should probably break the build on unsupported platforms, but we need to un-break
            # builds for now and can revisit this once we upgrade to a newer version of Ruby + Alpine.
 
-           architecture = RbConfig::CONFIG['host_cpu'] == 'x86_64' ? 'amd64' : 'i386'
+           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_')
+
+           architecture = RbConfig::CONFIG['host_cpu'] == 'x86_64' ? 'amd64' : 'i386'
            "#{os}_#{architecture}"
          when /darwin/
            'macos_cocoa'
@@ -68,8 +101,8 @@ if File.exist?("#{binary}.gz") && !File.exist?(binary)
 end
 
 unless File.exist? binary
-  raise 'Invalid platform, must be running on Ubuntu 18.04/20.04/22.04, ' \
-        'CentOS 7, Amazon Linux 2, or intel-based Cocoa macOS ' \
+  raise 'Invalid platform, must be running on Ubuntu 16.04/18.04/20.04/22.04, ' \
+        'CentOS 6/7/8, Debian 9/10/11/12, Archlinux amd64, Debian 9/10/11/12 arm64, or Intel-based Cocoa macOS ' \
         "(missing binary: #{binary})."
 end