Skip to content

J
Jupyter Docker Stacks
You need to sign in or sign up before continuing.
Commit 8d22c86e authored by Peter Parente's avatar Peter Parente Committed by GitHub
Browse files
Options

Merge pull request #677 from jakirkham/use_cf_tini 

Install tini from conda-forge
parents 02d387b3 0bfb920e
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
base-notebook/Dockerfile
View file @ 8d22c86e
...@@ -26,12 +26,6 @@ RUN apt-get update && apt-get -yq dist-upgrade \ ...@@ -26,12 +26,6 @@ RUN apt-get update && apt-get -yq dist-upgrade \
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
locale-gen locale-gen
# Install Tini
RUN wget --quiet https://github.com/krallin/tini/releases/download/v0.18.0/tini && \
echo "12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855 *tini" | sha256sum -c - && \
mv tini /usr/local/bin/tini && \
chmod +x /usr/local/bin/tini
# Configure environment # Configure environment
ENV CONDA_DIR=/opt/conda \ ENV CONDA_DIR=/opt/conda \
SHELL=/bin/bash \ SHELL=/bin/bash \
...@@ -79,6 +73,13 @@ RUN cd /tmp && \ ...@@ -79,6 +73,13 @@ RUN cd /tmp && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER
# Install Tini
RUN conda install --quiet --yes 'tini=0.18.0' && \
conda list tini | grep tini | tr -s ' ' | cut -d ' ' -f 1,2 >> $CONDA_DIR/conda-meta/pinned && \
conda clean -tipsy && \
fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER
# Install Jupyter Notebook, Lab, and Hub # Install Jupyter Notebook, Lab, and Hub
# Generate a notebook server config # Generate a notebook server config
# Cleanup temporary files # Cleanup temporary files
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment