Skip to content

Commit 653607c

Browse files
authored
Requirements fix (#9)
* Pinning requirements.txt * Singleuser dockerfile update. * Docker compose update (prod). * Fix volume mounts for users (use fixed name (backwards compatibility). * R kernel install updates. * Requirements revert. * Added workflow permissions.
1 parent 7ff89a2 commit 653607c

File tree

7 files changed

+13
-8
lines changed

7 files changed

+13
-8
lines changed

.github/workflows/docker-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: docker-jupyter-hub-all
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
branches: ['**']

.github/workflows/submodule_sync.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: submodules-sync
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
branches: ['**']

Dockerfile_singleuser

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ COPY ./requirements.txt /srv/jupyterhub/
216216
RUN if [ "$GPU_BUILD" = "true" ] && [ "$CPU_ARCHITECTURE" = "amd64" ]; then \
217217
uv pip install --system --no-cache-dir -r /srv/jupyterhub/requirements.txt ; \
218218
else \
219-
uv pip install --system --no-cache-dir -r /srv/jupyterhub/requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu/ ; \
219+
uv pip install --system --no-cache-dir -r /srv/jupyterhub/requirements.txt ; \
220220
fi
221221

222222
#######################################################################################################

config/jupyterhub_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class LocalNativeAuthenticator(NativeAuthenticator, LocalAuthenticator):
106106
class DockerSpawner(dockerspawner.DockerSpawner):
107107
def start(self):
108108
# username is self.user.name
109-
#self.volumes = {"jupyterhub-user-{}".format(self.user.name): NOTEBOOK_DIR}
109+
self.volumes = {"jupyterhub-user-{}".format(self.user.name): NOTEBOOK_DIR}
110110

111111
# Mount the real users Docker volume on the host to the notebook user"s
112112
# # notebook directory in the container

docker/docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ services:
1818
- jupyter-hub-shared-scratch:/home/jovyan/scratch
1919
- jupyter-hub-vol:/srv/jupyterhub
2020
# Security configs
21-
- ./${DEFAULT_SECURITY_DIR:-../security/}root-ca.key:/srv/jupyterhub/root-ca.key:ro
22-
- ./${DEFAULT_SECURITY_DIR:-../security/}root-ca.pem:/srv/jupyterhub/root-ca.pem:ro
21+
- ./${DEFAULT_SECURITY_DIR:-../security/}:/srv/jupyterhub/security:ro
2322
- ../config/jupyterhub_cookie_secret:/srv/jupyterhub/jupyterhub_cookie_secret:ro
2423
# User list and jupyter config
2524
- ../config/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro

requirements.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
wheel==0.45.1
2+
3+
24
virtualenv==20.31.2
35
ipywidgets==8.1.7
46
requests>=2.32.2
57
jupyter==1.1.1
6-
jupyterlab>=4.2.7
8+
jupyterlab>=4.2.0
79
jupyterlab_widgets==3.0.15
810
jupyter_contrib_core==0.4.2
911
jupyter_contrib_nbextensions==0.7.0
@@ -42,12 +44,11 @@ PyYAML==6.0.2
4244
opencv-python==4.11.0.86
4345
plotly==6.1.1
4446
click==8.2.1
45-
torchvision>=0.20.1
4647
traitlets==5.14.3
4748
xnat>=0.5.2
4849

4950
# ES stack
50-
opensearch-py>=2.0.0
51+
opensearch-py>=2.8.0
5152

5253
# code utils
5354
ruff==0.12.12

scripts/r_kernel_install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ install.packages(
3333
)
3434

3535
install.packages("lme4")
36-
install.packages("survminer")
3736
install.packages("nloptr")
3837
install.packages('IRkernel')
3938

0 commit comments

Comments
 (0)