Skip to content

Commit 36cff9c

Browse files
authored
Merge pull request #858 from rstudio/patch-jupyter-setuptools
Upgrade pip and setuptools on Jupyter venv creation
2 parents 781c1ee + 2acf74c commit 36cff9c

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

r-session-complete/Dockerfile.ubuntu2204

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
4444
RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
4545

4646
RUN /opt/python/"${PYTHON_VERSION}"/bin/python -m venv /opt/python/jupyter \
47+
&& /opt/python/jupyter/bin/python -m pip install --upgrade pip \
48+
&& /opt/python/jupyter/bin/python -m pip install --upgrade setuptools \
4749
&& /opt/python/jupyter/bin/python -m pip install \
4850
jupyterlab~=4.2.4 \
4951
notebook \

workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ RUN mkdir -p /opt/rstudio-license/ \
118118

119119
### Install Jupyter and extensions ###
120120
RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyter \
121+
&& /opt/python/jupyter/bin/python -m pip install --upgrade pip \
122+
&& /opt/python/jupyter/bin/python -m pip install --upgrade setuptools \
121123
&& /opt/python/jupyter/bin/python -m pip install\
122124
jupyterlab~=4.2.4 \
123125
notebook \

workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ RUN apt-get update --fix-missing -qq \
8888

8989
### Install Jupyter and extensions ###
9090
RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyter \
91+
&& /opt/python/jupyter/bin/python -m pip install --upgrade pip \
92+
&& /opt/python/jupyter/bin/python -m pip install --upgrade setuptools \
9193
&& /opt/python/jupyter/bin/pip install \
9294
jupyterlab~=4.2.4 \
9395
notebook \

workbench/Dockerfile.ubuntu2204

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ COPY startup/* /startup/base/
8080
COPY supervisord.conf /etc/supervisor/supervisord.conf
8181

8282
RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyter \
83+
&& /opt/python/jupyter/bin/python -m pip install --upgrade pip \
84+
&& /opt/python/jupyter/bin/python -m pip install --upgrade setuptools \
8385
&& /opt/python/jupyter/bin/python -m pip install \
8486
jupyterlab~=4.2.4 \
8587
notebook \

0 commit comments

Comments
 (0)