From 09fcd3e83b6327d27afd174d23ec116917adf000 Mon Sep 17 00:00:00 2001 From: Ingo Schuck Date: Thu, 7 May 2026 21:50:56 +0200 Subject: [PATCH] Revert "feat(images): toggle chromium installation" This reverts commit c302af9dd5f3bcccfdcee62f54693fb7120199ce. --- docs/02-setup/02-build-setup.md | 1 - images/bench/Dockerfile | 8 ++------ images/custom/Containerfile | 9 ++------- images/production/Containerfile | 9 ++------- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/docs/02-setup/02-build-setup.md b/docs/02-setup/02-build-setup.md index 09cef899..326de9bf 100644 --- a/docs/02-setup/02-build-setup.md +++ b/docs/02-setup/02-build-setup.md @@ -96,7 +96,6 @@ See [Automated Builds and Deployment](../03-production/06-automated-builds-and-d | PYTHON_VERSION | Python version for the base image | | NODE_VERSION | Node.js version | | WKHTMLTOPDF_VERSION | wkhtmltopdf version | -| INSTALL_CHROMIUM | Configure chromium installation, defaults to `true` - needed for Frappe Workbench version >15 | | **bench only** | | | DEBIAN_BASE | Debian base version for the bench image, defaults to `bookworm` | | WKHTMLTOPDF_DISTRO | use the specified distro for debian package. Default is `bookworm` | diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 1cb0b278..9c21345d 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -4,7 +4,6 @@ LABEL author=frappé ARG GIT_REPO=https://github.com/frappe/bench.git ARG GIT_BRANCH=v5.x -ARG INSTALL_CHROMIUM=true RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ @@ -24,6 +23,8 @@ RUN apt-get update \ libharfbuzz0b \ libpangoft2-1.0-0 \ libpangocairo-1.0-0 \ + #Chromium + chromium-headless-shell \ # to work inside the container locales \ build-essential \ @@ -74,11 +75,6 @@ RUN apt-get update \ file \ # For MIME type detection media-types \ - # Chromium - && if [ "$INSTALL_CHROMIUM" = "true" ]; then \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - chromium-headless-shell; \ - fi \ && rm -rf /var/lib/apt/lists/* RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ diff --git a/images/custom/Containerfile b/images/custom/Containerfile index 5f8072f6..2ecb06d7 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -8,8 +8,6 @@ COPY resources/core/nginx/security_headers.conf /etc/nginx/snippets/security_hea ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm -ARG INSTALL_CHROMIUM=true - ARG NODE_VERSION=24.13.0 ENV NVM_DIR=/home/frappe/.nvm ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -28,6 +26,8 @@ RUN useradd -ms /bin/bash frappe \ libharfbuzz0b \ libpangoft2-1.0-0 \ libpangocairo-1.0-0 \ + #Chromium + chromium-headless-shell \ # For backups restic \ gpg \ @@ -62,11 +62,6 @@ RUN useradd -ms /bin/bash frappe \ && curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \ && apt-get install -y ./$downloaded_file \ && rm $downloaded_file \ - # Chromium - && if [ "$INSTALL_CHROMIUM" = "true" ]; then \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - chromium-headless-shell; \ - fi \ # Clean up && rm -rf /var/lib/apt/lists/* \ && rm -fr /etc/nginx/sites-enabled/default \ diff --git a/images/production/Containerfile b/images/production/Containerfile index e2a2f3ee..f95a9703 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -4,8 +4,6 @@ FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm -ARG INSTALL_CHROMIUM=true - ARG NODE_VERSION=24.13.0 ENV NVM_DIR=/home/frappe/.nvm ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -24,6 +22,8 @@ RUN useradd -ms /bin/bash frappe \ libharfbuzz0b \ libpangoft2-1.0-0 \ libpangocairo-1.0-0 \ + #Chromium + chromium-headless-shell \ # For backups restic \ gpg \ @@ -58,11 +58,6 @@ RUN useradd -ms /bin/bash frappe \ && curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \ && apt-get install -y ./$downloaded_file \ && rm $downloaded_file \ - # Chromium - && if [ "$INSTALL_CHROMIUM" = "true" ]; then \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - chromium-headless-shell; \ - fi \ # Clean up && rm -rf /var/lib/apt/lists/* \ && rm -fr /etc/nginx/sites-enabled/default \