Merge upgrades to support version 0.12.6.5

.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_22.04

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

.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

.github/workflows/ci.yml

@@ -0,0 +1,68 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  tests-on-x86-mac:
+    runs-on: macos-13
+    strategy:
+      matrix:
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Run tests with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
+        run: bundle exec rake
+  tests-on-x86-docker:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.2']
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Ruby ${{ matrix.ruby-version }} on ubuntu
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Run tests on docker(x86)
+        run: bundle exec rake
+  tests-on-arm:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.2']
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+      - uses: actions/checkout@v4
+      - name: Install Ruby ${{ matrix.ruby-version }} on ubuntu
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Run tests on docker(arm64)
+        env:
+          ARM: 1
+          COMPOSE_FILE: docker-compose-arm.yml
+        run: |
+          set -xeu
+          sudo apt update
+          sudo apt-get install -y docker-compose          
+          bundle install          
+          bundle exec rake
+
+

.gitignore

@@ -1,18 +1,31 @@
 .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
-bin/wkhtmltopdf_ubuntu_20.04_amd64
-bin/wkhtmltopdf_centos_6_i386
-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,31 @@
+# 0.12.6.10
+
+- 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.6
+
+Add support for Ubuntu 22.04
+
 # 0.12.6.5
 
 Fix ability to use on Debian 9 systems
@@ -64,4 +92,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
+```