Skip to content

Commit 50ae9cd

Browse files
committed
conda 4.7.5
much faster installs had to move WORKDIR $HOME up due to tempfile permission issues with conda 4.7
1 parent 4c2fed0 commit 50ae9cd

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

base-notebook/Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,19 @@ RUN echo "auth requisite pam_deny.so" >> /etc/pam.d/su && \
6060
fix-permissions "$(dirname $CONDA_DIR)"
6161

6262
USER $NB_UID
63+
WORKDIR $HOME
6364

6465
# Setup work directory for backward-compatibility
6566
RUN mkdir /home/$NB_USER/work && \
6667
fix-permissions /home/$NB_USER
6768

6869
# Install conda as jovyan and check the md5 sum provided on the download site
69-
ENV MINICONDA_VERSION=4.5.12 \
70-
CONDA_VERSION=4.6.14
70+
ENV MINICONDA_VERSION=4.6.14 \
71+
CONDA_VERSION=4.7.5
7172

7273
RUN cd /tmp && \
7374
wget --quiet https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \
74-
echo "866ae9dff53ad0874e1d1a60b1ad1ef8 *Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" | md5sum -c - && \
75+
echo "718259965f234088d785cad1fbd7de03 *Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" | md5sum -c - && \
7576
/bin/bash Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
7677
rm Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \
7778
echo "conda ${CONDA_VERSION}" >> $CONDA_DIR/conda-meta/pinned && \
@@ -112,10 +113,7 @@ RUN conda install --quiet --yes \
112113
fix-permissions $CONDA_DIR && \
113114
fix-permissions /home/$NB_USER
114115

115-
USER root
116-
117116
EXPOSE 8888
118-
WORKDIR $HOME
119117

120118
# Configure container startup
121119
ENTRYPOINT ["tini", "-g", "--"]
@@ -126,6 +124,9 @@ COPY start.sh /usr/local/bin/
126124
COPY start-notebook.sh /usr/local/bin/
127125
COPY start-singleuser.sh /usr/local/bin/
128126
COPY jupyter_notebook_config.py /etc/jupyter/
127+
128+
# Fix permissions on /etc/jupyter as root
129+
USER root
129130
RUN fix-permissions /etc/jupyter/
130131

131132
# Switch back to jovyan to avoid accidental container runs as root

0 commit comments

Comments
 (0)