Skip to content

Commit

Permalink
Merge pull request #856 from rstudio/dev
Browse files Browse the repository at this point in the history 
Merge dev -> main, fixing workbench jupyter kernel versions
  • Loading branch information
@bschwedler
bschwedler authored Oct 11, 2024
2 parents a0d1a26 + 781c1ee commit 8cabf5e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
7 changes: 4 additions & 3 deletions r-session-complete/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ RUN /opt/python/"${PYTHON_VERSION}"/bin/python -m venv /opt/python/jupyter \
notebook \
pwb_jupyterlab~=1.0 \
&& ln -s /opt/python/jupyter/bin/jupyter /usr/local/bin/jupyter \
&& /opt/python/jupyter/bin/python -m pip install ipykernel \
&& /opt/python/jupyter/bin/python -m ipykernel install --name py${PYTHON_VERSION} --display-name "Python ${PYTHON_VERSION}" \
&& /opt/python/jupyter/bin/python -m ipykernel install --name py${PYTHON_VERSION_ALT} --display-name "Python ${PYTHON_VERSION_ALT}" \
&& /opt/python/${PYTHON_VERSION}/bin/python -m pip install ipykernel \
&& /opt/python/${PYTHON_VERSION_ALT}/bin/python -m pip install ipykernel \
&& /opt/python/${PYTHON_VERSION}/bin/python -m ipykernel install --name py${PYTHON_VERSION} --display-name "Python ${PYTHON_VERSION}" \
&& /opt/python/${PYTHON_VERSION_ALT}/bin/python -m ipykernel install --name py${PYTHON_VERSION_ALT} --display-name "Python ${PYTHON_VERSION_ALT}" \
&& /opt/python/jupyter/bin/python -m pip cache purge

ENV PATH="/opt/python/jupyter/bin:${PATH}"
Expand Down
7 changes: 4 additions & 3 deletions workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyt
notebook \
pwb_jupyterlab~=1.0 \
&& ln -s /opt/python/jupyter/bin/jupyter /usr/local/bin/jupyter \
&& /opt/python/jupyter/bin/python -m pip install ipykernel \
&& /opt/python/jupyter/bin/python -m ipykernel install --name py${PYTHON_VERSION} --display-name "Python ${PYTHON_VERSION}" \
&& /opt/python/jupyter/bin/python -m ipykernel install --name py${PYTHON_VERSION_ALT} --display-name "Python ${PYTHON_VERSION_ALT}" \
&& /opt/python/${PYTHON_VERSION}/bin/python -m pip install ipykernel \
&& /opt/python/${PYTHON_VERSION_ALT}/bin/python -m pip install ipykernel \
&& /opt/python/${PYTHON_VERSION}/bin/python -m ipykernel install --name py${PYTHON_VERSION} --display-name "Python ${PYTHON_VERSION}" \
&& /opt/python/${PYTHON_VERSION_ALT}/bin/python -m ipykernel install --name py${PYTHON_VERSION_ALT} --display-name "Python ${PYTHON_VERSION_ALT}" \
&& /opt/python/jupyter/bin/python3 -m pip cache purge

ADD --chmod=755 https://raw.githubusercontent.com/rstudio/wait-for-it/master/wait-for-it.sh /usr/local/bin/wait-for-it.sh
Expand Down
7 changes: 4 additions & 3 deletions workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,10 @@ RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyt
notebook \
pwb_jupyterlab~=1.0 \
&& ln -s /opt/python/jupyter/bin/jupyter /usr/local/bin/jupyter \
&& /opt/python/jupyter/bin/python -m pip install ipykernel \
&& /opt/python/jupyter/bin/python -m ipykernel install --name py${PYTHON_VERSION} --display-name "Python ${PYTHON_VERSION}" \
&& /opt/python/jupyter/bin/python -m ipykernel install --name py${PYTHON_VERSION_ALT} --display-name "Python ${PYTHON_VERSION_ALT}" \
&& /opt/python/${PYTHON_VERSION}/bin/python -m pip install ipykernel \
&& /opt/python/${PYTHON_VERSION_ALT}/bin/python -m pip install ipykernel \
&& /opt/python/${PYTHON_VERSION}/bin/python -m ipykernel install --name py${PYTHON_VERSION} --display-name "Python ${PYTHON_VERSION}" \
&& /opt/python/${PYTHON_VERSION_ALT}/bin/python -m ipykernel install --name py${PYTHON_VERSION_ALT} --display-name "Python ${PYTHON_VERSION_ALT}" \
&& /opt/python/jupyter/bin/python3 -m pip cache purge

### Install basic data science packages for Python and R ###
Expand Down
7 changes: 4 additions & 3 deletions workbench/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@ RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyt
notebook \
pwb_jupyterlab~=1.0 \
&& ln -s /opt/python/jupyter/bin/jupyter /usr/local/bin/jupyter \
&& /opt/python/jupyter/bin/python -m pip install ipykernel \
&& /opt/python/jupyter/bin/python -m ipykernel install --name py${PYTHON_VERSION} --display-name "Python ${PYTHON_VERSION}" \
&& /opt/python/jupyter/bin/python -m ipykernel install --name py${PYTHON_VERSION_ALT} --display-name "Python ${PYTHON_VERSION_ALT}" \
&& /opt/python/${PYTHON_VERSION}/bin/python -m pip install ipykernel \
&& /opt/python/${PYTHON_VERSION_ALT}/bin/python -m pip install ipykernel \
&& /opt/python/${PYTHON_VERSION}/bin/python -m ipykernel install --name py${PYTHON_VERSION} --display-name "Python ${PYTHON_VERSION}" \
&& /opt/python/${PYTHON_VERSION_ALT}/bin/python -m ipykernel install --name py${PYTHON_VERSION_ALT} --display-name "Python ${PYTHON_VERSION_ALT}" \
&& /opt/python/jupyter/bin/python -m pip cache purge

RUN curl -fsSL -o /usr/local/bin/wait-for-it.sh https://raw.githubusercontent.com/rstudio/wait-for-it/master/wait-for-it.sh && \
Expand Down

0 comments on commit 8cabf5e

Please sign in to comment.