Skip to content

Commit

Permalink
Merge pull request #134 from jakirkham/use_travis_ci
Browse files Browse the repository at this point in the history
Use Travis CI
  • Loading branch information
parente committed Mar 7, 2016
2 parents 1cd259b + 5880e3c commit 0cddf3e
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 15 deletions.
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
language: generic

sudo: required
services:
- docker

before_install:
- make refresh-all

script:
- make build-all
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ refresh/%:
# skip if error: a stack might not be on dockerhub yet
-docker pull $(OWNER)/$(notdir $@):latest

refresh-all: $(patsubst %,refresh/%, $(ALL_STACKS))

release-all: environment-check \
$(patsubst %,refresh/%, $(ALL_STACKS)) \
$(patsubst %,build/%, $(ALL_STACKS)) \
Expand Down
6 changes: 3 additions & 3 deletions all-spark-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ RUN apt-get update && \
USER jovyan

# Install Python 3 packages
RUN conda install --yes \
RUN conda install --quiet --yes \
'ipywidgets=4.1*' \
'pandas=0.17*' \
'matplotlib=1.5*' \
Expand All @@ -79,7 +79,7 @@ RUN conda install --yes \
&& conda clean -tipsy

# Install Python 2 packages and kernel spec
RUN conda create --yes -p $CONDA_DIR/envs/python2 python=2.7 \
RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
'ipython=4.1*' \
'ipywidgets=4.1*' \
'pandas=0.17*' \
Expand All @@ -92,7 +92,7 @@ RUN conda create --yes -p $CONDA_DIR/envs/python2 python=2.7 \

# R packages
RUN conda config --add channels r
RUN conda install --yes \
RUN conda install --quiet --yes \
'r-base=3.2*' \
'r-irkernel=0.5*' \
'r-ggplot2=1.0*' \
Expand Down
6 changes: 3 additions & 3 deletions datascience-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN apt-get update && \
USER jovyan

# Install Python 3 packages
RUN conda install --yes \
RUN conda install --quiet --yes \
'ipywidgets=4.1*' \
'pandas=0.17*' \
'matplotlib=1.5*' \
Expand All @@ -48,7 +48,7 @@ RUN conda install --yes \
&& conda clean -tipsy

# Install Python 2 packages
RUN conda create --yes -p $CONDA_DIR/envs/python2 python=2.7 \
RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
'ipython=4.1*' \
'ipywidgets=4.1*' \
'pandas=0.17*' \
Expand All @@ -71,7 +71,7 @@ RUN conda create --yes -p $CONDA_DIR/envs/python2 python=2.7 \

# R packages including IRKernel which gets installed globally.
RUN conda config --add channels r
RUN conda install --yes \
RUN conda install --quiet --yes \
'rpy2=2.7*' \
'r-base=3.2*' \
'r-irkernel=0.5*' \
Expand Down
4 changes: 3 additions & 1 deletion minimal-kernel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
FROM debian:jessie

# Debian Jessie image released 2016 March 01.
FROM debian@sha256:a9c958be96d7d40df920e7041608f2f017af81800ca5ad23e327bc402626b58e

MAINTAINER Jupyter Project <jupyter@googlegroups.com>

Expand Down
7 changes: 4 additions & 3 deletions minimal-notebook/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.

FROM debian:jessie
# Debian Jessie image released 2016 March 01.
FROM debian@sha256:a9c958be96d7d40df920e7041608f2f017af81800ca5ad23e327bc402626b58e

MAINTAINER Jupyter Project <jupyter@googlegroups.com>

Expand Down Expand Up @@ -70,11 +71,11 @@ RUN cd /tmp && \
echo "9ea57c0fdf481acf89d816184f969b04bc44dea27b258c4e86b1e3a25ff26aa0 *Miniconda3-3.19.0-Linux-x86_64.sh" | sha256sum -c - && \
/bin/bash Miniconda3-3.19.0-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
rm Miniconda3-3.19.0-Linux-x86_64.sh && \
$CONDA_DIR/bin/conda install --yes conda==3.19.1 && \
$CONDA_DIR/bin/conda install --quiet --yes conda==3.19.1 && \
conda clean -tipsy

# Install Jupyter notebook as jovyan
RUN conda install --yes \
RUN conda install --quiet --yes \
'notebook=4.1*' \
terminado \
&& conda clean -tipsy
Expand Down
4 changes: 2 additions & 2 deletions pyspark-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ENV MESOS_NATIVE_LIBRARY /usr/local/lib/libmesos.so
USER jovyan

# Install Python 3 packages
RUN conda install --yes \
RUN conda install --quiet --yes \
'ipywidgets=4.1*' \
'pandas=0.17*' \
'matplotlib=1.5*' \
Expand All @@ -52,7 +52,7 @@ RUN conda install --yes \
&& conda clean -tipsy

# Install Python 2 packages and kernel spec
RUN conda create --yes -p $CONDA_DIR/envs/python2 python=2.7 \
RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
'ipython=4.1*' \
'ipywidgets=4.1*' \
'pandas=0.17*' \
Expand Down
2 changes: 1 addition & 1 deletion r-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ USER jovyan

# R packages
RUN conda config --add channels r
RUN conda install --yes \
RUN conda install --quiet --yes \
'r-base=3.2*' \
'r-irkernel=0.5*' \
'r-plyr=1.8*' \
Expand Down
4 changes: 2 additions & 2 deletions scipy-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN apt-get update && \
USER jovyan

# Install Python 3 packages
RUN conda install --yes \
RUN conda install --quiet --yes \
'ipywidgets=4.1*' \
'pandas=0.17*' \
'matplotlib=1.5*' \
Expand All @@ -34,7 +34,7 @@ RUN conda install --yes \
&& conda clean -tipsy

# Install Python 2 packages
RUN conda create --yes -p $CONDA_DIR/envs/python2 python=2.7 \
RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
'ipython=4.1*' \
'ipywidgets=4.1*' \
'pandas=0.17*' \
Expand Down

0 comments on commit 0cddf3e

Please sign in to comment.