Skip to content

Commit 2805112

Browse files
committed
Locked versions of jupyter_server to 2.6. 2.11+ have new md5 argument to
get(). Locked version of jupyter_sciencedata to match.
1 parent 7f08ae2 commit 2805112

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

jupyter_sciencedata/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ARG ROOT_CONTAINER=ubuntu:focal-20210119@sha256:3093096ee188f8ff4531949b8f6115af
1414
ARG BASE_CONTAINER=$ROOT_CONTAINER
1515
FROM $BASE_CONTAINER
1616

17-
LABEL maintainer="ScienceData Project <cloud@deic.dk>"
17+
LABEL maintainer="ScienceData Project <support@sciencedata.dk>"
1818
ARG NB_USER="sciencedata"
1919
ARG NB_UID="1000"
2020
ARG NB_GID="100"
@@ -145,7 +145,10 @@ RUN wget --quiet "https://github.com/conda-forge/miniforge/releases/download/${m
145145
# 'jupyterlab=3.5.3' && \
146146
RUN conda install --quiet --yes \
147147
'notebook' \
148-
'jupyter_server=2.*' \
148+
# 'jupyter_server=2.*' \ # 2.11 introduces extra md5 parameter to get(),
149+
# not supported by ther version of jupyter_sciencedata
150+
# used by the downstream jupyter_sciencedata_custom
151+
'jupyter_server=2.6.*' \
149152
'nbclassic' \
150153
'jupyterlab' && \
151154
conda clean --all -f -y && \

jupyter_sciencedata_custom/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Copyright ScienceData team
22
# Distributed under the terms of the Modified BSD License.
33

4-
# Build command: docker build -t sciencedata/jupyter_sciencedata_custom:1.1 .
5-
# Push command: docker push sciencedata/jupyter_sciencedata_custom:1.1
4+
# Build command: docker build -t sciencedata/jupyter_sciencedata_custom:1.2 .
5+
# Push command: docker push sciencedata/jupyter_sciencedata_custom:1.2
66
# Run command: docker run -p 8080:80 -p 4022:22 sciencedata/jupyter_sciencedata_custom
77

88
FROM sciencedata/jupyter_sciencedata
99

10-
LABEL maintainer="ScienceData Project <cloud@deic.dk>"
10+
LABEL maintainer="ScienceData Project <support@sciencedata.dk>"
1111
ARG NB_USER="sciencedata"
1212
ARG NB_UID="1000"
1313
ARG NB_GID="100"
@@ -29,7 +29,8 @@ USER $NB_UID
2929
RUN pip install pycurl webdavclient3
3030
ADD https://api.github.com/repos/deic-dk/jupyter_sciencedata/git/refs/heads/main version.json
3131
RUN sudo chown "${NB_USER}":users version.json
32-
RUN git clone -b main https://github.com/deic-dk/jupyter_sciencedata.git
32+
#RUN git clone -b main https://github.com/deic-dk/jupyter_sciencedata.git
33+
RUN git clone --depth 1 --branch 1.0 https://github.com/deic-dk/jupyter_sciencedata.git
3334
RUN pip install jupyter_sciencedata/
3435

3536
# TOC extension

0 commit comments

Comments
 (0)