Add arm support

Author: ibot3

.github/workflows/ci-cd.yml

@@ -21,7 +21,14 @@ env:
 jobs:
   test:
     name: Run Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            arch: amd64
+          - runner: ubuntu-24.04-arm64
+            arch: arm64
 
     steps:
       - name: Checkout code
@@ -30,7 +37,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.13'
           cache: 'pip'
 
       - name: Install system dependencies
@@ -47,6 +54,10 @@ jobs:
         run: |
           pytest -v --tb=short
 
+      - name: Test summary
+        run: |
+          echo "✅ Tests passed on ${{ matrix.arch }}" >> $GITHUB_STEP_SUMMARY
+
   build-and-push:
     name: Build and Push Docker Image
     runs-on: ubuntu-latest
@@ -60,6 +71,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -95,6 +109,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -105,6 +120,8 @@ jobs:
         run: |
           echo "### Docker Image Build Summary :rocket:" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**Platforms:** linux/amd64, linux/arm64" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
           echo "**Image Tags:**" >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
           echo "${{ steps.meta.outputs.tags }}" >> $GITHUB_STEP_SUMMARY

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim
+FROM python:3.13-slim
 
 ARG UID=1000
 ARG GID=1000
@@ -10,6 +10,7 @@ RUN groupadd --force --gid $GID app \
     && useradd --non-unique --home-dir /opt/app --create-home --uid $UID --gid $GID --comment "Application" app
 
 # Install wkhtmltopdf and dependencies
+ARG TARGETARCH
 RUN apt-get update && apt-get install -y --no-install-recommends \
     wget \
     ca-certificates \
@@ -18,7 +19,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libxrender1 \
     xfonts-75dpi \
     xfonts-base \
-    && wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb -O /tmp/wkhtmltox.deb \
+    && case ${TARGETARCH} in \
+         "amd64")  WKHTML_ARCH=amd64  ;; \
+         "arm64")  WKHTML_ARCH=arm64  ;; \
+         *)        echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
+       esac \
+    && wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_${WKHTML_ARCH}.deb -O /tmp/wkhtmltox.deb \
     && apt-get install -y /tmp/wkhtmltox.deb \
     && rm /tmp/wkhtmltox.deb \
     && apt-get remove -y wget \

README.md

@@ -7,12 +7,18 @@ A simple FastAPI REST application to run wkhtmltopdf.
 ### Docker
 Use the provided Dockerfile or the built image at `ghcr.io/matbyte-com/htmltopdf-api`.
 
+**Supported Architectures:**
+- `linux/amd64` (x86_64)
+- `linux/arm64` (aarch64)
+
 Available tags:
 - `latest` - Latest build from the main branch
 - `a.b.c` - Semantic version tags (e.g., `1.0.0`, `1.0`, `1`)
 - `<branch>-<sha>` - Branch-specific builds with git SHA
 - `<branch>` - Latest build from a specific branch
 
+All images are multi-architecture and will automatically pull the correct version for your platform.
+
 ### Virtual Environment
 
 - `python3 -m venv venv`
@@ -55,10 +61,10 @@ pytest --cov=main --cov-report=html
 
 This project uses GitHub Actions for continuous integration and deployment:
 
-- **Tests**: Run automatically on every push and pull request
-- **Docker Images**: Built and pushed to GitHub Container Registry only after tests pass
+- **Tests**: Run automatically on every push and pull request on both AMD64 and ARM64 architectures
+- **Docker Images**: Multi-architecture images (linux/amd64, linux/arm64) built and pushed to GitHub Container Registry only after tests pass on both architectures
 - **Tagging**: Images are automatically tagged with:
   - Git branch name
   - Git SHA
-  - Semantic version tags
+  - Semantic version tags in format `a.b.c` (e.g., `1.0.0`, `1.0`, `1`)
   - `latest` tag for the default branch