feat: arm builds bb

vladfrangu · vladfrangu · commit 16a004aee9c6 · 2026-01-08T13:34:32.000+02:00
diff --git a/.github/workflows/release-node-playwright.yaml b/.github/workflows/release-node-playwright.yaml
@@ -235,7 +235,7 @@ jobs:
           build-args: |
             NODE_VERSION=${{ matrix.node-version }}
             PLAYWRIGHT_VERSION=${{ format('v{0}-', matrix.playwright-version) }}
-          platforms: linux/amd64
+          platforms: linux/amd64${{ (matrix.image-name != 'node-playwright' && matrix.image-name != 'node-playwright-chrome' && ',linux/arm64') || '' }}
           provenance: true
           push: true
           tags: ${{ fromJson(steps.prepare-tags.outputs.result).allTags }}
diff --git a/.github/workflows/release-node.yaml b/.github/workflows/release-node.yaml
@@ -221,7 +221,7 @@ jobs:
           context: ./${{ matrix.image-name }}
           file: ./${{ matrix.image-name }}/Dockerfile
           build-args: NODE_VERSION=${{ matrix.node-version }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           provenance: true
           push: true
           tags: ${{ fromJson(steps.prepare-tags.outputs.result).allTags }}
diff --git a/.github/workflows/release-python-playwright.yaml b/.github/workflows/release-python-playwright.yaml
@@ -218,7 +218,8 @@ jobs:
             PYTHON_VERSION=${{ matrix.python-version }}
             APIFY_VERSION=${{ env.APIFY_VERSION }}
             PLAYWRIGHT_VERSION=${{ matrix.playwright-version }}
-          platforms: linux/amd64
+          # TODO: linux/arm64 will only work if we do NOT install google-chrome like we did in node-playwright(-chrome)
+          platforms: linux/amd64,linux/arm64
           provenance: true
           push: true
           tags: ${{ fromJson(steps.prepare-tags.outputs.result).allTags }}
diff --git a/.github/workflows/release-python.yaml b/.github/workflows/release-python.yaml
@@ -214,7 +214,7 @@ jobs:
           build-args: |
             PYTHON_VERSION=${{ matrix.python-version }}
             APIFY_VERSION=${{ env.APIFY_VERSION }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           provenance: true
           push: true
           tags: ${{ fromJson(steps.prepare-tags.outputs.result).allTags }}
diff --git a/Makefile b/Makefile
diff --git a/node-playwright-camoufox/Dockerfile b/node-playwright-camoufox/Dockerfile
@@ -1,6 +1,6 @@
-ARG NODE_VERSION=20
+ARG NODE_VERSION=22
 # Use trixie to be consistent across node versions.
-FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim
+FROM node:${NODE_VERSION}-trixie-slim
 
 LABEL maintainer="support@apify.com" description="Base image for Apify Actors using Camoufox"
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/node-playwright-camoufox/xvfb-entrypoint.sh b/node-playwright-camoufox/xvfb-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+echo "Running on architecture: $(uname -m)"
+
 echo "Will run command: xvfb-run -a -s \"-ac -screen 0 $XVFB_WHD -nolisten tcp\" $@"
 xvfb-run -a -s "-ac -screen 0 $XVFB_WHD -nolisten tcp" "$@"
diff --git a/node-playwright-chrome/Dockerfile b/node-playwright-chrome/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=20
+ARG NODE_VERSION=22
 # Use trixie to be consistent across node versions.
 FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim
 
diff --git a/node-playwright-chrome/xvfb-entrypoint.sh b/node-playwright-chrome/xvfb-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+echo "Running on architecture: $(uname -m)"
+
 echo "Will run command: xvfb-run -a -s \"-ac -screen 0 $XVFB_WHD -nolisten tcp\" $@"
 xvfb-run -a -s "-ac -screen 0 $XVFB_WHD -nolisten tcp" "$@"
diff --git a/node-playwright-firefox/Dockerfile b/node-playwright-firefox/Dockerfile
@@ -1,6 +1,6 @@
-ARG NODE_VERSION=20
+ARG NODE_VERSION=22
 # Use trixie to be consistent across node versions.
-FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim
+FROM node:${NODE_VERSION}-trixie-slim
 
 LABEL maintainer="support@apify.com" description="Base image for Apify Actors using Firefox"
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/node-playwright-firefox/xvfb-entrypoint.sh b/node-playwright-firefox/xvfb-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+echo "Running on architecture: $(uname -m)"
+
 echo "Will run command: xvfb-run -a -s \"-ac -screen 0 $XVFB_WHD -nolisten tcp\" $@"
 xvfb-run -a -s "-ac -screen 0 $XVFB_WHD -nolisten tcp" "$@"
diff --git a/node-playwright-webkit/Dockerfile b/node-playwright-webkit/Dockerfile
@@ -1,5 +1,5 @@
-FROM --platform=linux/amd64 ubuntu:jammy
-ARG NODE_VERSION=20
+FROM ubuntu:jammy
+ARG NODE_VERSION=22
 
 LABEL maintainer="support@apify.com" description="Base image for Apify Actors using Webkit"
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/node-playwright-webkit/xvfb-entrypoint.sh b/node-playwright-webkit/xvfb-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+echo "Running on architecture: $(uname -m)"
+
 echo "Will run command: xvfb-run -a -s \"-ac -screen 0 $XVFB_WHD -nolisten tcp\" $@"
 xvfb-run -a -s "-ac -screen 0 $XVFB_WHD -nolisten tcp" "$@"
diff --git a/node-playwright/Dockerfile b/node-playwright/Dockerfile
@@ -1,7 +1,7 @@
 ARG PLAYWRIGHT_VERSION=
 FROM --platform=linux/amd64 mcr.microsoft.com/playwright:${PLAYWRIGHT_VERSION}jammy
 
-ARG NODE_VERSION=20
+ARG NODE_VERSION=22
 
 LABEL maintainer="support@apify.com" description="Base image for Apify Actors using headless Chrome"
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/node-playwright/xvfb-entrypoint.sh b/node-playwright/xvfb-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+echo "Running on architecture: $(uname -m)"
+
 echo "Will run command: xvfb-run -a -s \"-ac -screen 0 $XVFB_WHD -nolisten tcp\" $@"
 xvfb-run -a -s "-ac -screen 0 $XVFB_WHD -nolisten tcp" "$@"
diff --git a/node-puppeteer-chrome/Dockerfile b/node-puppeteer-chrome/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=20
+ARG NODE_VERSION=22
 # Use trixie to be consistent across node versions.
 FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim
 
diff --git a/node-puppeteer-chrome/xvfb-entrypoint.sh b/node-puppeteer-chrome/xvfb-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+echo "Running on architecture: $(uname -m)"
+
 echo "Will run command: xvfb-run -a -s \"-ac -screen 0 $XVFB_WHD -nolisten tcp\" $@"
 xvfb-run -a -s "-ac -screen 0 $XVFB_WHD -nolisten tcp" "$@"
diff --git a/python-playwright/xvfb-entrypoint.sh b/python-playwright/xvfb-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+echo "Running on architecture: $(uname -m)"
+
 echo "Will run command: xvfb-run -a -s \"-ac -screen 0 $XVFB_WHD -nolisten tcp\" $@"
 xvfb-run -a -s "-ac -screen 0 $XVFB_WHD -nolisten tcp" "$@"
diff --git a/python-selenium/Dockerfile b/python-selenium/Dockerfile
@@ -2,7 +2,7 @@
 ARG PYTHON_VERSION
 
 # Extend from the latest Debian and its slim version to keep the image as small as possible
-FROM python:${PYTHON_VERSION}-slim-trixie
+FROM --platform=linux/amd64 python:${PYTHON_VERSION}-slim-trixie
 
 # Add labels to the image to identify it as an Apify Actor
 LABEL maintainer="support@apify.com" \
@@ -82,7 +82,7 @@ RUN groupadd -r myuser && useradd -r -g myuser -G audio,video myuser \
     && rm -rf /var/lib/apt/lists/* /var/log/*
 
 # Download and install Geckodriver
-RUN GECKO_DRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-linux64.tar.gz" && \
+RUN GECKO_DRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/v0.36.0/geckodriver-v0.36.0-linux64.tar.gz" && \
     curl --silent --show-error --location --output /tmp/geckodriver.tar.gz "$GECKO_DRIVER_URL" && \
     tar --gzip --extract --file=/tmp/geckodriver.tar.gz --directory=/usr/local/bin && \
     rm -f /tmp/geckodriver.tar.gz
diff --git a/python-selenium/xvfb-entrypoint.sh b/python-selenium/xvfb-entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+echo "Running on architecture: $(uname -m)"
+
 echo "Will run command: xvfb-run -a -s \"-ac -screen 0 $XVFB_WHD -nolisten tcp\" $@"
 xvfb-run -a -s "-ac -screen 0 $XVFB_WHD -nolisten tcp" "$@"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG NODE_VERSION=20`
	`1`	`+ARG NODE_VERSION=22`
`2`	`2`	`# Use trixie to be consistent across node versions.`
`3`	`3`	`FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim`
`4`	`4`