New dockerfiles

Author: saroele

Dockerfile.dev

@@ -1,20 +1,50 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
-RUN apt-get update && apt-get -y install build-essential libssl-dev libffi-dev python-dev python-numpy python-scipy python-matplotlib python-pandas python-pip
-RUN pip install -U pip jupyter
+RUN apt-get update && apt-get -y install \
+	python3 \
+	python3-dev \
+	python3-setuptools \
+	python3-pip \
+	build-essential \
+	libssl-dev \
+	libffi-dev \
+	python3-numpy \
+	python3-scipy \
+	python3-matplotlib \
+	python3-pandas 
+
+RUN pip3 install -U pip jupyter
 
 # install all dependencies for OpenGrid
 ADD requirements.txt /usr/local/opengrid/requirements.txt
-RUN pip install -r /usr/local/opengrid/requirements.txt
+RUN pip3 install -r /usr/local/opengrid/requirements.txt
+
+# special treatment for charts required for python3
+COPY charts-0.4.6-python3.tar.gz /usr/local/opengrid/charts-0.4.6-python3.tar.gz
+RUN pip3 install -U /usr/local/opengrid/charts-0.4.6-python3.tar.gz
 
 # create volumes: one for the source code and work dir, one for the data
 VOLUME /usr/local/opengrid
 VOLUME /data
 
-ENV PYTHONPATH=/usr/local/opengrid:$PYTHONPATH
+# add anonymous data files for electricity, gas and water
+ADD data/electricity*.pickle /data/
+ADD data/gas*.pickle /data/
+ADD data/water*.pickle /data/
 
 # add information for uploading a distribution to pypi.  No passwords!
 ADD .pypirc /root/.pypirc
 
+ENV PYTHONPATH=/usr/local/opengrid:$PYTHONPATH
 WORKDIR /usr/local/opengrid
-CMD ipython notebook --ip='*'
+
+# Add Tini. Tini operates as a process subreaper for jupyter. This prevents
+# kernel crashes.
+ENV TINI_VERSION v0.6.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
+RUN chmod +x /usr/bin/tini
+ENTRYPOINT ["/usr/bin/tini", "--"]
+
+EXPOSE 8888
+CMD ["jupyter", "notebook", "--port=8888", "--no-browser", "--ip=0.0.0.0", "--NotebookApp.token=''"]
+

Dockerfile.release

@@ -1,27 +1,10 @@
-FROM ubuntu:14.04
+FROM opengrid/dev:latest
 
-RUN apt-get update && apt-get -y install python-numpy python-scipy python-matplotlib python-pandas python-pip libssl-dev
-RUN pip install -U pip jupyter
+# install OpenGrid
+RUN pip3 install opengrid
 
-# install opengrid
-RUN pip install opengrid
+ADD ./opengrid/config/opengrid.cfg.example.docker /usr/local/opengrid/opengrid.cfg
+ADD ./opengrid/recipes/ /usr/local/opengrid/recipes/
 
-# Additional installation, add to first RUN command later
-RUN apt-get -y install pandoc texlive
-RUN apt-get -y install texlive-latex-extra
-RUN apt-get -y install wkhtmltopdf
-RUN pip install seaborn pdfkit 
 
-RUN pip install https://github.com/ipython-contrib/jupyter_contrib_nbextensions/tarball/master
-RUN jupyter contrib nbextension install --user
-RUN jupyter nbextensions_configurator enable --user
 
-# create a working dir and copy notebooks
-VOLUME /usr/local/opengrid
-WORKDIR /usr/local/opengrid/notebooks
-ADD notebooks /usr/local/opengrid/notebooks
-
-# create volume for the data
-VOLUME /data
-
-CMD jupyter notebook --ip='*'

Dockerfile_python3.dev

@@ -1,6 +1,3 @@
 #!/bin/bash
 docker build -f Dockerfile.dev -t opengrid/dev:latest .
-docker push opengrid/dev:latest
-
-docker build -f Dockerfile_python3.dev -t opengrid/dev:python3 .
-docker push opengrid/dev:python3
+docker push opengrid/dev:latest