Skip to content

Commit 71e43e6

Browse files
benz0libenz0li
committed
Update base image to debian:12
- base: Use Zsh as default shell for NB_USER - base: Add 'Resource Monitor' extension
1 parent 5222c7c commit 71e43e6

27 files changed

+46
-20
lines changed

‎VERSION_MATRIX.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ Topmost entry = Tag `latest`
44

55
| Python | Jupyter Hub | Jupyter Lab | code‑server (Code) | Git | Git LFS | Pandoc | Quarto[^2] | CTAN date[^2] | Linux distro |
66
|:-----------|:------------|:------------|:-------------------|:-------|:--------|:-------|:------------|:--------------|:-------------|
7-
| 3.11.4 | 4.0.1 | 3.6.4 | 4.13.0 (1.78.2) | 2.41.0 | 3.3.0 | 3.1.1 | 1.3.361 | | Debian 11 |
7+
| 3.11.4 | 4.0.1 | 3.6.4 | 4.13.0 (1.78.2) | 2.41.0 | 3.3.0 | 3.1.1 | 1.3.361 | | Debian 12 |
8+
| 3.11.3 | 4.0.0 | 3.6.4 | 4.13.0 (1.78.2) | 2.41.0 | 3.3.0 | 3.1.1 | 1.3.361 | 2023‑06‑06 | Debian 11 |
9+
| 3.10.12 | 4.0.0 | 3.6.4 | 4.13.0 (1.78.2) | 2.41.0 | 3.3.0 | 3.1.1 | 1.3.361 | 2023‑06‑06 | Debian 11 |
810
| 3.11.2[^1] | 3.1.1 | 3.6.3 | 4.9.1 (1.73.1) | 2.40.0 | 3.3.0 | 2.19.2 | 1.2.475[^3] | 2023‑04‑05 | Debian 11 |
911
| 3.10.11 | 3.1.1 | 3.6.3 | 4.9.1 (1.73.1) | 2.40.0 | 3.3.0 | 2.19.2 | 1.2.475[^3] | 2023‑04‑05 | Debian 11 |
1012
| 3.11.1[^1] | 3.1.1 | 3.5.3 | 4.9.1 (1.73.1) | 2.39.1 | 3.3.0 | 2.19.2 | 1.2.335[^3] | 2023‑02‑08 | Debian 11 |

‎base/3.10.10.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ RUN mkdir /opt/code-server \
210210
$HOME/.local
211211

212212
## Install JupyterLab
213-
RUN pip install \
213+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
214+
&& pip install \
214215
jupyter-server-proxy \
215216
jupyterhub==${JUPYTERHUB_VERSION} \
216217
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/3.10.11.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ RUN mkdir /opt/code-server \
215215
$HOME/.local
216216

217217
## Install JupyterLab
218-
RUN pip install \
218+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
219+
&& pip install \
219220
jupyter-server-proxy \
220221
jupyterhub==${JUPYTERHUB_VERSION} \
221222
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/3.10.12.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ RUN mkdir /opt/code-server \
222222
${HOME}/.local
223223

224224
## Install JupyterLab
225-
RUN pip install \
225+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
226+
&& pip install \
226227
jupyter-server-proxy \
227228
jupyterhub==${JUPYTERHUB_VERSION} \
228229
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/3.10.9.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ RUN mkdir /opt/code-server \
201201
$HOME/.local
202202

203203
## Install JupyterLab
204-
RUN pip install \
204+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
205+
&& pip install \
205206
jupyter-server-proxy \
206207
jupyterhub==${JUPYTERHUB_VERSION} \
207208
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/3.11.0.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ RUN mkdir /opt/code-server \
205205
$HOME/.local
206206

207207
## Install JupyterLab
208-
RUN pip install \
208+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
209+
&& pip install \
209210
jupyter-server-proxy \
210211
jupyterhub==${JUPYTERHUB_VERSION} \
211212
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/3.11.1.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ RUN mkdir /opt/code-server \
210210
$HOME/.local
211211

212212
## Install JupyterLab
213-
RUN pip install \
213+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
214+
&& pip install \
214215
jupyter-server-proxy \
215216
jupyterhub==${JUPYTERHUB_VERSION} \
216217
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/3.11.2.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ RUN mkdir /opt/code-server \
215215
$HOME/.local
216216

217217
## Install JupyterLab
218-
RUN pip install \
218+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
219+
&& pip install \
219220
jupyter-server-proxy \
220221
jupyterhub==${JUPYTERHUB_VERSION} \
221222
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/3.11.3.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ RUN mkdir /opt/code-server \
222222
${HOME}/.local
223223

224224
## Install JupyterLab
225-
RUN pip install \
225+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
226+
&& pip install \
226227
jupyter-server-proxy \
227228
jupyterhub==${JUPYTERHUB_VERSION} \
228229
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/conf/ipython/usr/local/etc/ipython/ipython_config.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
# Copyright (c) 2022 b-data GmbH.
2-
# Distributed under the terms of the MIT License.
3-
41
c.InlineBackend.figure_formats = {"svg", "pdf"}
52

63
import os
74

85
if (
96
os.path.exists(os.path.join(os.environ["HOME"], "bin"))
10-
and not os.path.join(os.environ["HOME"], "bin") in os.getenv("PATH")
7+
and not os.path.join(os.environ["HOME"], "bin") in os.getenv("PATH", "")
118
):
129
os.environ["PATH"] = (
1310
os.path.join(os.environ["HOME"], "bin")
@@ -17,7 +14,8 @@
1714

1815
if (
1916
os.path.exists(os.path.join(os.environ["HOME"], ".local", "bin"))
20-
and not os.path.join(os.environ["HOME"], ".local", "bin") in os.getenv("PATH")
17+
and not os.path.join(os.environ["HOME"], ".local", "bin")
18+
in os.getenv("PATH", "")
2119
):
2220
os.environ["PATH"] = (
2321
os.path.join(os.environ["HOME"], ".local", "bin")

‎base/conf/user/var/backups/skel/.local/share/code-server/User/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
"graph": false
1313
}
1414
},
15+
"resmon.show.battery": false,
16+
"resmon.show.cpufreq": false,
1517
"telemetry.telemetryLevel": "off",
1618
"terminal.integrated.fontFamily": "MesloLGS NF",
1719
"workbench.colorTheme": "Default Dark+"

‎base/latest.Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_IMAGE=debian
2-
ARG BASE_IMAGE_TAG=bullseye
2+
ARG BASE_IMAGE_TAG=12
33
ARG BUILD_ON_IMAGE=glcr.b-data.ch/python/ver
44
ARG PYTHON_VERSION
55
ARG CUDA_IMAGE_FLAVOR
@@ -172,7 +172,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
172172
sed -i 's/.*pam_limits.so/#&/g' /etc/pam.d/sudo-i; \
173173
fi \
174174
## Add user
175-
&& useradd -l -m -s /bin/bash -N -u ${NB_UID} ${NB_USER} \
175+
&& useradd -l -m -s $(which zsh) -N -u ${NB_UID} ${NB_USER} \
176176
&& mkdir -p /var/backups/skel \
177177
&& chown ${NB_UID}:${NB_GID} /var/backups/skel \
178178
## Install Tini
@@ -203,6 +203,8 @@ RUN mkdir /opt/code-server \
203203
&& code-server --extensions-dir ${CODE_BUILTIN_EXTENSIONS_DIR} --install-extension alefragnani.project-manager-12.7.0.vsix \
204204
&& curl -sLO https://dl.b-data.ch/vsix/piotrpalarz.vscode-gitignore-generator-1.0.3.vsix \
205205
&& code-server --extensions-dir ${CODE_BUILTIN_EXTENSIONS_DIR} --install-extension piotrpalarz.vscode-gitignore-generator-1.0.3.vsix \
206+
&& curl -sLO https://dl.b-data.ch/vsix/mutantdino.resourcemonitor-1.0.7.vsix \
207+
&& code-server --extensions-dir ${CODE_BUILTIN_EXTENSIONS_DIR} --install-extension mutantdino.resourcemonitor-1.0.7.vsix \
206208
&& code-server --extensions-dir ${CODE_BUILTIN_EXTENSIONS_DIR} --install-extension GitLab.gitlab-workflow \
207209
&& code-server --extensions-dir ${CODE_BUILTIN_EXTENSIONS_DIR} --install-extension ms-python.python \
208210
&& code-server --extensions-dir ${CODE_BUILTIN_EXTENSIONS_DIR} --install-extension ms-toolsai.jupyter \
@@ -222,7 +224,8 @@ RUN mkdir /opt/code-server \
222224
${HOME}/.local
223225

224226
## Install JupyterLab
225-
RUN pip install \
227+
RUN export PIP_BREAK_SYSTEM_PACKAGES=1 \
228+
&& pip install \
226229
jupyter-server-proxy \
227230
jupyterhub==${JUPYTERHUB_VERSION} \
228231
jupyterlab==${JUPYTERLAB_VERSION} \

‎base/scripts/usr/local/bin/start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ if [ "$(id -u)" == 0 ] ; then
103103
fi
104104
# Recreate the desired user as we want it
105105
userdel "${NB_USER}"
106-
useradd --home "/home/${NB_USER}" --shell /bin/bash --uid "${NB_UID}" --gid "${NB_GID}" --groups 100 --no-log-init "${NB_USER}"
106+
useradd --home "/home/${NB_USER}" --shell "$(which zsh)" --uid "${NB_UID}" --gid "${NB_GID}" --groups 100 --no-log-init "${NB_USER}"
107107
fi
108108

109109
# Move or symlink the jovyan home directory to the desired users home
@@ -238,7 +238,7 @@ else
238238
# We cannot use "sed --in-place" since sed tries to create a temp file in
239239
# /etc/ and we may not have write access. Apply sed on our own temp file:
240240
sed --expression="s/^jovyan:/nayvoj:/" /etc/passwd > /tmp/passwd
241-
echo "${NB_USER}:x:$(id -u):$(id -g):,,,:/home/jovyan:/bin/bash" >> /tmp/passwd
241+
echo "${NB_USER}:x:$(id -u):$(id -g):,,,:/home/jovyan:$(which zsh)" >> /tmp/passwd
242242
cat /tmp/passwd > /etc/passwd
243243
rm /tmp/passwd
244244

‎common/subtags/devtools/latest.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_IMAGE=debian
2-
ARG BASE_IMAGE_TAG=bullseye
2+
ARG BASE_IMAGE_TAG=12
33
ARG BUILD_ON_IMAGE
44
ARG PYTHON_VERSION
55

‎scipy/3.10.10.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
8484
&& chmod -R g+w /opt/TinyTeX \
8585
&& chmod -R g+wx /opt/TinyTeX/bin \
8686
## Install Python packages
87+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
8788
&& pip install \
8889
altair \
8990
beautifulsoup4 \

‎scipy/3.10.11.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
8484
&& chmod -R g+w /opt/TinyTeX \
8585
&& chmod -R g+wx /opt/TinyTeX/bin \
8686
## Install Python packages
87+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
8788
&& pip install \
8889
altair \
8990
beautifulsoup4 \

‎scipy/3.10.12.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
8787
/etc/fonts/conf.d/09-texlive.conf \
8888
&& fc-cache -fsv \
8989
## Install Python packages
90+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
9091
&& pip install \
9192
altair \
9293
beautifulsoup4 \

‎scipy/3.10.5.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
7474
&& chmod -R g+w /opt/TinyTeX \
7575
&& chmod -R g+wx /opt/TinyTeX/bin \
7676
## Install Python packages
77+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
7778
&& pip install \
7879
altair \
7980
beautifulsoup4 \

‎scipy/3.10.6.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
7575
&& chmod -R g+w /opt/TinyTeX \
7676
&& chmod -R g+wx /opt/TinyTeX/bin \
7777
## Install Python packages
78+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
7879
&& pip install \
7980
altair \
8081
beautifulsoup4 \

‎scipy/3.10.7.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
7575
&& chmod -R g+w /opt/TinyTeX \
7676
&& chmod -R g+wx /opt/TinyTeX/bin \
7777
## Install Python packages
78+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
7879
&& pip install \
7980
altair \
8081
beautifulsoup4 \

‎scipy/3.10.8.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
7575
&& chmod -R g+w /opt/TinyTeX \
7676
&& chmod -R g+wx /opt/TinyTeX/bin \
7777
## Install Python packages
78+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
7879
&& pip install \
7980
altair \
8081
beautifulsoup4 \

‎scipy/3.10.9.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
9595
&& chmod -R g+w /opt/TinyTeX \
9696
&& chmod -R g+wx /opt/TinyTeX/bin \
9797
## Install Python packages
98+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
9899
&& pip install \
99100
altair \
100101
beautifulsoup4 \

‎scipy/3.11.0.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
9595
&& chmod -R g+w /opt/TinyTeX \
9696
&& chmod -R g+wx /opt/TinyTeX/bin \
9797
## Install Python packages
98+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
9899
&& pip install \
99100
altair \
100101
beautifulsoup4 \

‎scipy/3.11.1.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
8484
&& chmod -R g+w /opt/TinyTeX \
8585
&& chmod -R g+wx /opt/TinyTeX/bin \
8686
## Install Python packages
87+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
8788
&& pip install \
8889
altair \
8990
beautifulsoup4 \

‎scipy/3.11.2.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
8484
&& chmod -R g+w /opt/TinyTeX \
8585
&& chmod -R g+wx /opt/TinyTeX/bin \
8686
## Install Python packages
87+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
8788
&& pip install \
8889
altair \
8990
beautifulsoup4 \

‎scipy/3.11.3.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
8787
/etc/fonts/conf.d/09-texlive.conf \
8888
&& fc-cache -fsv \
8989
## Install Python packages
90+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
9091
&& pip install \
9192
altair \
9293
beautifulsoup4 \

‎scipy/latest.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
8787
/etc/fonts/conf.d/09-texlive.conf \
8888
&& fc-cache -fsv \
8989
## Install Python packages
90+
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
9091
&& pip install \
9192
altair \
9293
beautifulsoup4 \

0 commit comments

Comments
 (0)