From 0af1302485fed9d8c646a6ccd11dd1e80a76b55e Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 30 Nov 2021 16:03:01 +0530 Subject: [PATCH] fix: install py 3.7 using pyenv (#590) * fix: install py 3.7 using pyenv * fix: set pyenv global versions * refactor: cleaup code --- build/bench/Dockerfile | 70 +++++++++++++++++++++++++++--------------- development/README.md | 2 ++ 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/build/bench/Dockerfile b/build/bench/Dockerfile index f7cdaeb8..a2df40a1 100644 --- a/build/bench/Dockerfile +++ b/build/bench/Dockerfile @@ -1,16 +1,10 @@ -FROM python:3.9-slim-bullseye as build +FROM debian:bullseye-slim as build LABEL author=frappé ARG GIT_REPO=https://github.com/frappe/bench.git ARG GIT_BRANCH=develop -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 \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ # For frappe framework @@ -59,7 +53,8 @@ RUN apt-get update \ 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 wkhtmltopdf +# Detect arch and install wkhtmltopdf +ENV WKHTMLTOPDF_VERSION 0.12.6-1 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 \ @@ -67,7 +62,9 @@ RUN if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \ && 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 +# 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 \ && useradd --no-log-init -r -m -u 1000 -g 1000 -G sudo frappe \ && echo "frappe ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers @@ -75,20 +72,38 @@ RUN groupadd -g 1000 frappe \ USER frappe WORKDIR /home/frappe +# Install Python via pyenv +# Python 3.7 sits here for ERPNext version-12 +# TODO: Remove Python 3.7 when version-12 will not be supported +ENV PYTHON_VERSION_V12=3.7.12 +ENV PYTHON_VERSION=3.9.9 +ENV PYENV_ROOT /home/frappe/.pyenv +ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH + +# From https://github.com/pyenv/pyenv#basic-github-checkout +RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \ + && pyenv install $PYTHON_VERSION_V12 \ + && pyenv install $PYTHON_VERSION \ + && pyenv global $PYTHON_VERSION $PYTHON_VERSION_V12 \ + && sed -Ei -e '/^([^#]|$)/ {a export PYENV_ROOT="/home/frappe/.pyenv" a export PATH="$PYENV_ROOT/bin:$PATH" a ' -e ':a' -e '$!{n;ba};}' ~/.profile \ + && echo 'eval "$(pyenv init --path)"' >>~/.profile \ + && echo 'eval "$(pyenv init -)"' >>~/.bashrc + # 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 \ - && pip install --user -e .bench - -# Export python executables for Dockerfile 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 +RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \ + && pip install --user -e .bench \ + && echo "export PATH=/home/frappe/.local/bin:\$PATH" >> /home/frappe/.bashrc + +# Install Node via nvm +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} -# Install nvm with node 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 \ @@ -96,20 +111,25 @@ RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | && nvm use v${NODE_VERSION} \ && npm install -g yarn \ && nvm alias default v${NODE_VERSION} \ - && rm -rf ${NVM_DIR}/.cache + && rm -rf ${NVM_DIR}/.cache \ + && echo 'export NVM_DIR="/home/frappe/.nvm"' >>~/.bashrc \ + && 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 + EXPOSE 8000-8005 9000-9005 6787 FROM build as test -# Print version and verify bashrc is properly sourced so that everything works in the Dockerfile +# Print version and verify bashrc is properly sourced so that everything works +# in the interactive shell and Dockerfile + RUN node --version \ && npm --version \ - && yarn --version -# Print version and verify bashrc is properly sourced so that everything works in the interactive shell + && yarn --version \ + && bench --help + RUN bash -c "node --version" \ && bash -c "npm --version" \ - && bash -c "yarn --version" - -RUN bench --help -RUN bash -c "bench --help" \ No newline at end of file + && bash -c "yarn --version" \ + && bash -c "bench --help" \ No newline at end of file diff --git a/development/README.md b/development/README.md index c73d73f0..c4b6ca11 100644 --- a/development/README.md +++ b/development/README.md @@ -62,6 +62,8 @@ bench init --skip-redis-config-generation --frappe-branch version-13 frappe-benc cd frappe-bench ``` +Note: For version 12 use python 3.7 by passing option to `bench init` command, e.g. `bench init --skip-redis-config-generation --frappe-branch version-12 --python python3.7 frappe-bench` + ### Setup hosts We need to tell bench to use the right containers instead of localhost. Run the following commands inside the container: