From c18ef2b69a62a3b7c1df22987a99d3691d6fce96 Mon Sep 17 00:00:00 2001 From: martkaczmarek <31852710+martkaczmarek@users.noreply.github.com> Date: Fri, 22 May 2026 13:19:00 +0200 Subject: [PATCH] Pycups env and install --- images/bench/Dockerfile | 5 +++++ images/custom/Containerfile | 3 +++ images/production/Containerfile | 3 +++ 3 files changed, 11 insertions(+) diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 2b2540b5..3d445d48 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -5,6 +5,7 @@ LABEL author=frappé ARG GIT_REPO=https://github.com/frappe/bench.git ARG GIT_BRANCH=v5.x ARG INSTALL_CHROMIUM=true +ARG INSTALL_PYCUPS=false RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ @@ -79,6 +80,8 @@ RUN apt-get update \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ chromium-headless-shell; \ fi \ + # Install cups + && if [ "${INSTALL_PYCUPS}" != "false" ]; then apt-get install --no-install-recommends -y libcups2-dev cups-client 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 \ @@ -151,6 +154,8 @@ RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \ && echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> ~/.bashrc +# Install pycups +RUN if [ "${INSTALL_PYCUPS}" != "false" ]; then RUN /home/frappe/frappe-bench/env/bin/pip install --no-cache-dir pycups fi \ EXPOSE 8000-8005 9000-9005 6787 diff --git a/images/custom/Containerfile b/images/custom/Containerfile index da2e050a..e9afb5d9 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -122,6 +122,9 @@ RUN apt-get update \ libbz2-dev \ && rm -rf /var/lib/apt/lists/* +# Install pycups +RUN if [ "${INSTALL_PYCUPS}" != "false" ]; then RUN /home/frappe/frappe-bench/env/bin/pip install --no-cache-dir pycups fi \ + USER frappe ARG FRAPPE_BRANCH=version-16 diff --git a/images/production/Containerfile b/images/production/Containerfile index 739f460d..db295bba 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -114,6 +114,9 @@ RUN apt-get update \ libbz2-dev \ && rm -rf /var/lib/apt/lists/* +# Install pycups +RUN if [ "${INSTALL_PYCUPS}" != "false" ]; then RUN /home/frappe/frappe-bench/env/bin/pip install --no-cache-dir pycups fi \ + USER frappe FROM build AS builder