diff --git a/Artefacts/apt_packages b/Artefacts/apt_packages index a60aad0eb43c183fbc8e0076f9d17385f953ef67..75980d7cbfb1c40b0ad0ca513da594655048c189 100644 --- a/Artefacts/apt_packages +++ b/Artefacts/apt_packages @@ -1,5 +1,6 @@ bash curl +openconnect graphviz grep host diff --git a/Artefacts/codeserver_extensions b/Artefacts/codeserver_extensions index f613cc258c8da7a67b38e7a646bb7c5822e3a372..fb82e8f9997bbb62e3e6f9c6527dd6aa5dfc34a3 100644 --- a/Artefacts/codeserver_extensions +++ b/Artefacts/codeserver_extensions @@ -1,9 +1,11 @@ -vscjava.vscode-java-pack -redhat.vscode-xml -vscode-icons-team.vscode-icons -SonarSource.sonarlint-vscode +eamodio.gitlens +executablebookproject.myst-highlight GabrielBB.vscode-lombok james-yu.latex-workshop jebbs.plantuml -eamodio.gitlens ms-python.python +redhat.vscode-xml +SonarSource.sonarlint-vscode +toolsai.jupyter +vscjava.vscode-java-pack +vscode-icons-team.vscode-icons \ No newline at end of file diff --git a/Artefacts/pip_jupyterlab_packages b/Artefacts/pip_jupyterlab_packages index 6149440015531e6d85a1be2f7dc56d68185b3e3d..b9223f53a990860a20e6e49cef71a46b67e1a895 100644 --- a/Artefacts/pip_jupyterlab_packages +++ b/Artefacts/pip_jupyterlab_packages @@ -1,19 +1,20 @@ +black +iplantuml +isort jinja-yaml-magic jupyter-book -jupyterlab-drawio -jupyterlab-myst -jupyterlab_rise jupyter-server-proxy -jupyterlab_latex +jupyterhub +jupyterlab_rise jupyterlab_widgets jupyterlab-code-formatter -black -isort -jupyterhub +jupyterlab-drawio jupyterlab-git +jupyterlab-link-share +jupyterlab-myst jupyterlab-system-monitor +jupytext nbgitpuller -iplantuml sphinx-inline-tabs sphinxcontrib-plantuml -sphinxcontrib-svg2pdfconverter +sphinxcontrib-svg2pdfconverter \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index be4b752582c480baaffc3f8a2c39ca76f61ed1fa..aaac04b1ef0e87bae681806a1d2d18b96266c85d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG LAB_BASE=jupyter/minimal-notebook:lab-3.6.1 +ARG LAB_BASE=jupyter/minimal-notebook:lab-3.6.2 FROM ${LAB_BASE} @@ -16,7 +16,8 @@ ARG BUILDPLATFORM RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" # Sets a cache for pip packages -ENV PIP_CACHE_DIR=/var/cache/buildkit/pip +#ENV PIP_CACHE_DIR=/var/cache/buildkit/pip +ENV PIP_CACHE_DIR=/home/jovyan/work/var/cache/buildkit/pip RUN mkdir -p ${PIP_CACHE_DIR} && \ mkdir -p /var/cache/apt @@ -145,7 +146,9 @@ RUN echo -e "\e[93m**** Update Jupyter config ****\e[38;5;241m" && \ -e '/c.ServerApp.data_dir =/ s/= .*/= "\/home\/jovyan\/jupyter_data"/' \ -e "/c.ServerApp.terminado_settings =/ s/= .*/= { 'shell_command': ['\/bin\/zsh'] }/" \ -e 's/# \(c.ServerApp.terminado_settings\)/\1/' \ - $HOME/.jupyter/jupyter_lab_config.py + $HOME/.jupyter/jupyter_lab_config.py + +RUN jupyter labextension install jupyterlab-jupytext RUN ln -s /usr/share/plantuml/plantuml.jar /usr/local/bin/ @@ -162,7 +165,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ ARCH_LEG=amd64; \ ARCH=amd64; \ fi && \ - mkdir -p /home/jovyan/.cache/gistatus && \ + mkdir -p /home/jovyan/.cache/gitstatus && \ curl -sL "https://github.com/romkatv/gitstatus/releases/download/v1.5.4/gitstatusd-linux-${ARCH_LEG}.tar.gz" | \ tar --directory="/home/jovyan/.cache/gitstatus" -zx