From a54d6f650077e1bdac8e84105ec95fe70ab6714a Mon Sep 17 00:00:00 2001
From: Lev <mail@vrslev.com>
Date: Mon, 8 Nov 2021 18:12:16 +0300
Subject: [PATCH] refactor(bench): Dockerfile

---
 build/bench/Dockerfile | 83 +++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 45 deletions(-)

diff --git a/build/bench/Dockerfile b/build/bench/Dockerfile
index 58d143d9..08ec7212 100644
--- a/build/bench/Dockerfile
+++ b/build/bench/Dockerfile
@@ -1,14 +1,20 @@
-# Frappe Bench Dockerfile
-FROM debian:buster-slim as build
+FROM python:3.9-slim-bullseye as build
+
+LABEL author=frappé
 
 ARG GIT_REPO=https://github.com/frappe/bench.git
 ARG GIT_BRANCH=develop
 
-LABEL author=frappé
+ENV NODE_VERSION=14.18.1
+ENV NODE_VERSION_FRAPPEV11=10.24.1
+ENV NVM_DIR /home/frappe/.nvm
+ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
+ENV WKHTMLTOPDF_VERSION 0.12.6-1
 
-RUN apt-get update -y && apt-get install  \
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    # For frappe framework
     git \
-    wkhtmltopdf \
     mariadb-client \
     postgresql-client \
     gettext-base \
@@ -29,6 +35,7 @@ RUN apt-get update -y && apt-get install  \
     watch \
     tree \
     nano \
+    less \
     software-properties-common \
     bash-completion \
     # For psycopg2
@@ -37,7 +44,7 @@ RUN apt-get update -y && apt-get install  \
     libffi-dev \
     liblcms2-dev \
     libldap2-dev \
-    libmariadbclient-dev \
+    # libmariadbclient-dev \
     libsasl2-dev \
     libtiff5-dev \
     libwebp-dev \
@@ -47,63 +54,49 @@ RUN apt-get update -y && apt-get install  \
     ssh-client \
     # VSCode container requirements
     net-tools \
-    # PYTHON
-    python3-dev \
-    python3-pip \
-    python3-setuptools \
-    python3-tk \
-    python-virtualenv \
-    less -y && \
-    apt-get clean && \
-    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 \
     && dpkg-reconfigure --frontend=noninteractive locales
 
-# Detect arch, download and install wkhtmltox
-RUN if [ `uname -m` = 'aarch64' ]; then export ARCH=arm64; fi \
-    && if [ `uname -m` = 'x86_64' ]; then export ARCH=amd64; fi \
-    && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${ARCH}.deb \
-    && dpkg -i wkhtmltox_0.12.6-1.buster_${ARCH}.deb && rm wkhtmltox_0.12.6-1.buster_${ARCH}.deb
+# Detect arch, download and install wkhtmltopdf
+RUN if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \
+    && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \
+    && downloaded_file=wkhtmltox_$WKHTMLTOPDF_VERSION.buster_${ARCH}.deb \
+    && wget -q https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
+    && dpkg -i $downloaded_file \
+    && rm $downloaded_file
 
 # Create new user with home directory, improve docker compatibility with UID/GID 1000, add user to sudo group, allow passwordless sudo, switch to that user and change directory to user home directory
-RUN groupadd -g 1000 frappe
-RUN useradd --no-log-init -r -m -u 1000 -g 1000 -G  sudo frappe
-RUN echo "frappe ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+RUN groupadd -g 1000 frappe \
+    && useradd --no-log-init -r -m -u 1000 -g 1000 -G sudo frappe \
+    && echo "frappe ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
 USER frappe
 WORKDIR /home/frappe
 
 # Clone and install bench in the local user home directory
 # For development, bench source is located in ~/.bench
 RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \
-    && pip3 install --user -e .bench
+    && pip install --user -e .bench
 
 # Export python executables for Dockerfile
-ENV PATH=/home/frappe/.local/bin:$PATH
+ENV PATH /home/frappe/.local/bin:$PATH
 # Export python executables for interactive shell
 RUN echo "export PATH=/home/frappe/.local/bin:\$PATH" >> /home/frappe/.bashrc
 
-# !!! UPDATE NODEJS PERIODICALLY WITH LATEST VERSIONS !!!
-# https://nodejs.org/en/about/releases/
-# https://nodejs.org/download/release/latest-v10.x/
-# https://nodejs.org/download/release/latest-v14.x/
-ENV NODE_VERSION=14.17.0
-ENV NODE_VERSION_FRAPPEV11=10.24.1
-
 # Install nvm with node
-RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh
-RUN chmod +x install.sh
-RUN ./install.sh
-ENV NVM_DIR=/home/frappe/.nvm
-
-# Install node for Frappe V11, install yarn
-RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION_FRAPPEV11}
-RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION_FRAPPEV11} && npm install -g yarn
-# Install node for latest frappe, set as default, install node
-RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
-RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION}  && npm install -g yarn
-RUN . "$NVM_DIR/nvm.sh" && nvm alias default v${NODE_VERSION}
-ENV PATH="/home/frappe/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
+RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \
+    && . ${NVM_DIR}/nvm.sh \
+    # Install node for Frappe V11, install yarn
+    && nvm install ${NODE_VERSION_FRAPPEV11} \
+    && nvm use v${NODE_VERSION_FRAPPEV11} \
+    && npm install -g yarn \
+    && nvm install ${NODE_VERSION} \
+    && nvm use v${NODE_VERSION} \
+    && npm install -g yarn \
+    && nvm alias default v${NODE_VERSION} \
+    && rm -rf ${NVM_DIR}/.cache
 
 EXPOSE 8000-8005 9000-9005 6787