Skip to content

J
Jupyter Docker Stacks
Commit fdc5f4d8 authored by Priya Seth's avatar Priya Seth
Browse files
Options

Updated patch file to build base-notebook Dockerfile on ppc64le

parent 599db13f
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 16 deletions
base-notebook/Dockerfile.ppc64le.patch
View file @ fdc5f4d8
--- Dockerfile 2016-12-08 12:23:10.288198002 -0500 --- Dockerfile 2017-05-09 06:09:42.429671387 -0400
+++ Dockerfile.ppc64le 2016-12-08 12:25:01.518197999 -0500 +++ Dockerfile.ppc64le 2017-05-09 06:09:42.429671387 -0400
@@ -1,36 +1,43 @@ @@ -1,37 +1,43 @@
-# Copyright (c) Jupyter Development Team. -# Copyright (c) Jupyter Development Team.
+# Copyright (c) IBM Corporation 2016 +# Copyright (c) IBM Corporation 2016
# Distributed under the terms of the Modified BSD License. # Distributed under the terms of the Modified BSD License.
-# Debian Jessie image released 2016 May 03. -# Debian Jessie debootstrap from 2017-02-27
-FROM debian@sha256:32a225e412babcd54c0ea777846183c61003d125278882873fb2bc97f9057c51 -# https://github.com/docker-library/official-images/commit/aa5973d0c918c70c035ec0746b8acaec3a4d7777
-FROM debian@sha256:52af198afd8c264f1035206ca66a5c48e602afb32dc912ebf9e9478134601ec4
+# Ubuntu image +# Ubuntu image
+FROM ppc64le/ubuntu:trusty +FROM ppc64le/ubuntu:trusty
...@@ -62,15 +63,14 @@ ...@@ -62,15 +63,14 @@
# Configure environment # Configure environment
ENV CONDA_DIR /opt/conda ENV CONDA_DIR /opt/conda
@@ -58,11 +65,10 @@ @@ -59,25 +65,29 @@
# Install conda as jovyan # Install conda as jovyan
RUN cd /tmp && \ RUN cd /tmp && \
mkdir -p $CONDA_DIR && \ mkdir -p $CONDA_DIR && \
- wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.1.11-Linux-x86_64.sh && \ - wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh && \
- echo "efd6a9362fc6b4085f599a881d20e57de628da8c1a898c08ec82874f3bad41bf *Miniconda3-4.1.11-Linux-x86_64.sh" | sha256sum -c - && \ - echo "c59b3dd3cad550ac7596e0d599b91e75d88826db132e4146030ef471bb434e9a *Miniconda3-4.2.12-Linux-x86_64.sh" | sha256sum -c - && \
- /bin/bash Miniconda3-4.1.11-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ - /bin/bash Miniconda3-4.2.12-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
- rm Miniconda3-4.1.11-Linux-x86_64.sh && \ - rm Miniconda3-4.2.12-Linux-x86_64.sh && \
- $CONDA_DIR/bin/conda install --quiet --yes conda==4.1.11 && \
+ wget https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-ppc64le.sh && \ + wget https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-ppc64le.sh && \
+ /bin/bash Miniconda3-4.2.12-Linux-ppc64le.sh -f -b -p $CONDA_DIR && \ + /bin/bash Miniconda3-4.2.12-Linux-ppc64le.sh -f -b -p $CONDA_DIR && \
+ rm -rf Miniconda3-4.2.12-Linux-ppc64le.sh && \ + rm -rf Miniconda3-4.2.12-Linux-ppc64le.sh && \
...@@ -78,14 +78,18 @@ ...@@ -78,14 +78,18 @@
$CONDA_DIR/bin/conda config --system --add channels conda-forge && \ $CONDA_DIR/bin/conda config --system --add channels conda-forge && \
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
conda clean -tipsy conda clean -tipsy
@@ -72,15 +78,16 @@
RUN echo "jpeg 8*" >> /opt/conda/conda-meta/pinned
# Install Jupyter notebook as jovyan -# Install Jupyter Notebook and Hub
-RUN conda install --quiet --yes \ -RUN conda install --quiet --yes \
- 'notebook=4.2*' \ - 'notebook=5.0.*' \
- jupyterhub=0.7 \ - 'jupyterhub=0.7.*' \
- 'jupyterlab=0.18.*' \
- && conda clean -tipsy - && conda clean -tipsy
+# Temporary workaround for https://github.com/jupyter/docker-stacks/issues/210
+# Stick with jpeg 8 to avoid problems with R packages
+RUN echo "jpeg 8*" >> /opt/conda/conda-meta/pinned
+
+# Install Jupyter notebook as jovyan
+RUN yes | pip install --upgrade pip +RUN yes | pip install --upgrade pip
+RUN yes | pip install --quiet --no-cache-dir \ +RUN yes | pip install --quiet --no-cache-dir \
+ 'notebook==4.2.*' \ + 'notebook==4.2.*' \
......
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