mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-17 13:55:08 +00:00
Add INSTALL_PYCUPS arg and install packages if value is true
This commit is contained in:
parent
753d846bb0
commit
b3d46de656
2 changed files with 6 additions and 0 deletions
|
|
@ -11,6 +11,7 @@ ARG WKHTMLTOPDF_DISTRO=bookworm
|
||||||
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}
|
||||||
|
ARG INSTALL_PYCUPS=false
|
||||||
|
|
||||||
RUN useradd -ms /bin/bash frappe \
|
RUN useradd -ms /bin/bash frappe \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
|
|
@ -62,6 +63,8 @@ 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 \
|
||||||
|
# Install cups
|
||||||
|
&& if [ "${INSTALL_PYCUPS}" != "false" ]; then apt-get install --no-install-recommends -y libcups2-dev cups-client 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 \
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ ARG WKHTMLTOPDF_DISTRO=bookworm
|
||||||
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}
|
||||||
|
ARG INSTALL_PYCUPS=false
|
||||||
|
|
||||||
RUN useradd -ms /bin/bash frappe \
|
RUN useradd -ms /bin/bash frappe \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
|
|
@ -58,6 +59,8 @@ 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 \
|
||||||
|
# Install cups
|
||||||
|
&& if [ "${INSTALL_PYCUPS}" != "false" ]; then apt-get install --no-install-recommends -y libcups2-dev cups-client 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