diff --git a/node-playwright-camoufox/Dockerfile b/node-playwright-camoufox/Dockerfile index 078fb4f1..26ba550b 100644 --- a/node-playwright-camoufox/Dockerfile +++ b/node-playwright-camoufox/Dockerfile @@ -1,6 +1,6 @@ ARG NODE_VERSION=20 -# Use bookworm to be consistent across node versions. -FROM --platform=linux/amd64 node:${NODE_VERSION}-bookworm-slim +# Use trixie to be consistent across node versions. +FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim LABEL maintainer="support@apify.com" description="Base image for Apify Actors using Camoufox" ENV DEBIAN_FRONTEND=noninteractive @@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive COPY ./register_intermediate_certs.sh ./register_intermediate_certs.sh # Install Firefox dependencies + tools -RUN sh -c 'echo "deb http://ftp.us.debian.org/debian bookworm main non-free" >> /etc/apt/sources.list.d/fonts.list' \ +RUN sh -c 'echo "deb http://ftp.us.debian.org/debian trixie main non-free" >> /etc/apt/sources.list.d/fonts.list' \ && apt update \ && apt install -y --no-install-recommends \ # Found this in other images, not sure whether it's needed, it does not come from Playwright deps diff --git a/node-playwright-chrome/Dockerfile b/node-playwright-chrome/Dockerfile index 520efb9c..2eb83f38 100644 --- a/node-playwright-chrome/Dockerfile +++ b/node-playwright-chrome/Dockerfile @@ -1,6 +1,6 @@ ARG NODE_VERSION=20 -# Use bookworm to be consistent across node versions. -FROM --platform=linux/amd64 node:${NODE_VERSION}-bookworm-slim +# Use trixie to be consistent across node versions. +FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim LABEL maintainer="support@apify.com" description="Base image for Apify Actors using Chrome" ENV DEBIAN_FRONTEND=noninteractive @@ -14,9 +14,13 @@ RUN \ mkdir -p /etc/default && echo 'repo_add_once=false' > /etc/default/google-chrome \ && apt update \ && apt install -y wget gnupg unzip ca-certificates xvfb xauth --no-install-recommends \ - && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ - && sh -c 'echo "deb http://ftp.us.debian.org/debian bookworm main non-free" >> /etc/apt/sources.list.d/fonts.list' \ + # Add Google Linux signing key + && wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub \ + | gpg --dearmor \ + | tee /usr/share/keyrings/google-linux-signing.gpg > /dev/null \ + # Add Google Chrome APT repo + && sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-linux-signing.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' \ + && sh -c 'echo "deb http://ftp.us.debian.org/debian trixie main non-free" >> /etc/apt/sources.list.d/fonts.list' \ && apt update \ && apt purge --auto-remove -y wget unzip \ && apt install -y \ @@ -26,7 +30,7 @@ RUN \ procps \ # Extras fonts-freefont-ttf \ - fonts-kacst \ + fonts-kacst-one \ fonts-thai-tlwg \ fonts-wqy-zenhei \ --no-install-recommends \ diff --git a/node-playwright-firefox/Dockerfile b/node-playwright-firefox/Dockerfile index 997f50ad..6d8cfbe3 100644 --- a/node-playwright-firefox/Dockerfile +++ b/node-playwright-firefox/Dockerfile @@ -1,6 +1,6 @@ ARG NODE_VERSION=20 -# Use bookworm to be consistent across node versions. -FROM --platform=linux/amd64 node:${NODE_VERSION}-bookworm-slim +# Use trixie to be consistent across node versions. +FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim LABEL maintainer="support@apify.com" description="Base image for Apify Actors using Firefox" ENV DEBIAN_FRONTEND=noninteractive @@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive COPY ./register_intermediate_certs.sh ./register_intermediate_certs.sh # Install Firefox dependencies + tools -RUN sh -c 'echo "deb http://ftp.us.debian.org/debian bookworm main non-free" >> /etc/apt/sources.list.d/fonts.list' \ +RUN sh -c 'echo "deb http://ftp.us.debian.org/debian trixie main non-free" >> /etc/apt/sources.list.d/fonts.list' \ && apt update \ && apt install -y --no-install-recommends \ # Found this in other images, not sure whether it's needed, it does not come from Playwright deps diff --git a/node-puppeteer-chrome/Dockerfile b/node-puppeteer-chrome/Dockerfile index 81055d26..201af1f1 100644 --- a/node-puppeteer-chrome/Dockerfile +++ b/node-puppeteer-chrome/Dockerfile @@ -1,6 +1,6 @@ ARG NODE_VERSION=20 -# Use bookworm to be consistent across node versions. -FROM --platform=linux/amd64 node:${NODE_VERSION}-bookworm-slim +# Use trixie to be consistent across node versions. +FROM --platform=linux/amd64 node:${NODE_VERSION}-trixie-slim LABEL maintainer="support@apify.com" description="Base image for Apify Actors using headless Chrome" ENV DEBIAN_FRONTEND=noninteractive @@ -11,15 +11,19 @@ ENV DEBIAN_FRONTEND=noninteractive # Note: this also installs the necessary libs to make the bundled version of Chromium that Puppeteer installs work. RUN apt update \ && apt install -y wget gnupg unzip ca-certificates --no-install-recommends \ - && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ - && sh -c 'echo "deb http://ftp.us.debian.org/debian bookworm main non-free" >> /etc/apt/sources.list.d/fonts.list' \ + # Add Google Linux signing key + && wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub \ + | gpg --dearmor \ + | tee /usr/share/keyrings/google-linux-signing.gpg > /dev/null \ + # Add Google Chrome APT repo + && sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-linux-signing.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list' \ + && sh -c 'echo "deb http://ftp.us.debian.org/debian trixie main non-free" >> /etc/apt/sources.list.d/fonts.list' \ && apt update \ && apt purge --auto-remove -y unzip \ && apt install -y \ fonts-freefont-ttf \ fonts-ipafont-gothic \ - fonts-kacst \ + fonts-kacst-one \ fonts-liberation \ fonts-thai-tlwg \ fonts-wqy-zenhei \