mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-17 13:55:08 +00:00
Revert "feat(images): toggle chromium installation"
This reverts commit c302af9dd5.
This commit is contained in:
parent
8f4130b5d3
commit
09fcd3e83b
4 changed files with 6 additions and 21 deletions
|
|
@ -96,7 +96,6 @@ See [Automated Builds and Deployment](../03-production/06-automated-builds-and-d
|
||||||
| PYTHON_VERSION | Python version for the base image |
|
| PYTHON_VERSION | Python version for the base image |
|
||||||
| NODE_VERSION | Node.js version |
|
| NODE_VERSION | Node.js version |
|
||||||
| WKHTMLTOPDF_VERSION | wkhtmltopdf version |
|
| WKHTMLTOPDF_VERSION | wkhtmltopdf version |
|
||||||
| INSTALL_CHROMIUM | Configure chromium installation, defaults to `true` - needed for Frappe Workbench version >15 |
|
|
||||||
| **bench only** | |
|
| **bench only** | |
|
||||||
| DEBIAN_BASE | Debian base version for the bench image, defaults to `bookworm` |
|
| DEBIAN_BASE | Debian base version for the bench image, defaults to `bookworm` |
|
||||||
| WKHTMLTOPDF_DISTRO | use the specified distro for debian package. Default is `bookworm` |
|
| WKHTMLTOPDF_DISTRO | use the specified distro for debian package. Default is `bookworm` |
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ LABEL author=frappé
|
||||||
|
|
||||||
ARG GIT_REPO=https://github.com/frappe/bench.git
|
ARG GIT_REPO=https://github.com/frappe/bench.git
|
||||||
ARG GIT_BRANCH=v5.x
|
ARG GIT_BRANCH=v5.x
|
||||||
ARG INSTALL_CHROMIUM=true
|
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||||
|
|
@ -24,6 +23,8 @@ RUN apt-get update \
|
||||||
libharfbuzz0b \
|
libharfbuzz0b \
|
||||||
libpangoft2-1.0-0 \
|
libpangoft2-1.0-0 \
|
||||||
libpangocairo-1.0-0 \
|
libpangocairo-1.0-0 \
|
||||||
|
#Chromium
|
||||||
|
chromium-headless-shell \
|
||||||
# to work inside the container
|
# to work inside the container
|
||||||
locales \
|
locales \
|
||||||
build-essential \
|
build-essential \
|
||||||
|
|
@ -74,11 +75,6 @@ RUN apt-get update \
|
||||||
file \
|
file \
|
||||||
# For MIME type detection
|
# For MIME type detection
|
||||||
media-types \
|
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/*
|
&& 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 \
|
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
|
||||||
|
|
|
||||||
|
|
@ -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_VERSION=0.12.6.1-3
|
||||||
ARG WKHTMLTOPDF_DISTRO=bookworm
|
ARG WKHTMLTOPDF_DISTRO=bookworm
|
||||||
ARG INSTALL_CHROMIUM=true
|
|
||||||
|
|
||||||
ARG NODE_VERSION=24.13.0
|
ARG NODE_VERSION=24.13.0
|
||||||
ENV NVM_DIR=/home/frappe/.nvm
|
ENV NVM_DIR=/home/frappe/.nvm
|
||||||
ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
|
ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
|
||||||
|
|
@ -28,6 +26,8 @@ RUN useradd -ms /bin/bash frappe \
|
||||||
libharfbuzz0b \
|
libharfbuzz0b \
|
||||||
libpangoft2-1.0-0 \
|
libpangoft2-1.0-0 \
|
||||||
libpangocairo-1.0-0 \
|
libpangocairo-1.0-0 \
|
||||||
|
#Chromium
|
||||||
|
chromium-headless-shell \
|
||||||
# For backups
|
# For backups
|
||||||
restic \
|
restic \
|
||||||
gpg \
|
gpg \
|
||||||
|
|
@ -62,11 +62,6 @@ RUN useradd -ms /bin/bash frappe \
|
||||||
&& curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
|
&& curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
|
||||||
&& apt-get install -y ./$downloaded_file \
|
&& apt-get install -y ./$downloaded_file \
|
||||||
&& rm $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
|
# Clean up
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& rm -fr /etc/nginx/sites-enabled/default \
|
&& rm -fr /etc/nginx/sites-enabled/default \
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@ FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
|
||||||
|
|
||||||
ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
|
ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
|
||||||
ARG WKHTMLTOPDF_DISTRO=bookworm
|
ARG WKHTMLTOPDF_DISTRO=bookworm
|
||||||
ARG INSTALL_CHROMIUM=true
|
|
||||||
|
|
||||||
ARG NODE_VERSION=24.13.0
|
ARG NODE_VERSION=24.13.0
|
||||||
ENV NVM_DIR=/home/frappe/.nvm
|
ENV NVM_DIR=/home/frappe/.nvm
|
||||||
ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
|
ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
|
||||||
|
|
@ -24,6 +22,8 @@ RUN useradd -ms /bin/bash frappe \
|
||||||
libharfbuzz0b \
|
libharfbuzz0b \
|
||||||
libpangoft2-1.0-0 \
|
libpangoft2-1.0-0 \
|
||||||
libpangocairo-1.0-0 \
|
libpangocairo-1.0-0 \
|
||||||
|
#Chromium
|
||||||
|
chromium-headless-shell \
|
||||||
# For backups
|
# For backups
|
||||||
restic \
|
restic \
|
||||||
gpg \
|
gpg \
|
||||||
|
|
@ -58,11 +58,6 @@ RUN useradd -ms /bin/bash frappe \
|
||||||
&& curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
|
&& curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
|
||||||
&& apt-get install -y ./$downloaded_file \
|
&& apt-get install -y ./$downloaded_file \
|
||||||
&& rm $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
|
# Clean up
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& rm -fr /etc/nginx/sites-enabled/default \
|
&& rm -fr /etc/nginx/sites-enabled/default \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue