diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 2b2540b5..e2cd4a78 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 /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..f167e033 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -64,7 +64,7 @@ RUN useradd -ms /bin/bash frappe \ && apt-get install -y ./$downloaded_file \ && rm $downloaded_file \ # Install cups - && if [ "${INSTALL_PYCUPS}" != "false" ]; then apt-get install --no-install-recommends -y libcups2-dev cups-client fi \ + && if [ "$INSTALL_PYCUPS" != "false" ]; then apt-get install --no-install-recommends -y libcups2-dev cups-client; fi \ # Chromium && if [ "$INSTALL_CHROMIUM" != "false" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ @@ -122,6 +122,9 @@ RUN apt-get update \ libbz2-dev \ && rm -rf /var/lib/apt/lists/* +# Install pycups +RUN if [ "$INSTALL_PYCUPS" != "false" ]; then /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..860e131b 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -60,7 +60,7 @@ RUN useradd -ms /bin/bash frappe \ && apt-get install -y ./$downloaded_file \ && rm $downloaded_file \ # Install cups - && if [ "${INSTALL_PYCUPS}" != "false" ]; then apt-get install --no-install-recommends -y libcups2-dev cups-client fi \ + && if [ "$INSTALL_PYCUPS" != "false" ]; then apt-get install --no-install-recommends -y libcups2-dev cups-client; fi \ # Chromium && if [ "$INSTALL_CHROMIUM" != "false" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ @@ -114,6 +114,9 @@ RUN apt-get update \ libbz2-dev \ && rm -rf /var/lib/apt/lists/* +# Install pycups +RUN if [ "$INSTALL_PYCUPS" != "false" ]; then /home/frappe/frappe-bench/env/bin/pip install --no-cache-dir pycups; fi + USER frappe FROM build AS builder