Fix #61

Author: Rick Lan

README.md

@@ -13,11 +13,21 @@ To support both old and new environments, [docker images](https://hub.docker.com
 
 [Python](https://www.python.org/) 3 only as Python 2 is [end-of-life](https://pythonclock.org), so [deprecated](deprecated/deprecated.md).
 
-All of images include vision-centric libraries, such as
+All of the images include:
 * [JupyterLab](https://jupyterlab.readthedocs.io/en/stable/)
+* [scikit-learn](https://scikit-learn.org/stable/)
+
+Visualization libraries:
+* [matplotlib](https://matplotlib.org)
+* [seaborn](https://seaborn.pydata.org)
+
+Vision-centric libraries:
 * [OpenCV](https://opencv.org/)
 * [scikit-image](http://scikit-image.org/)
 
+NLP libraries:
+* [Natural Language Toolkit](https://www.nltk.org)
+
 Check the CUDA compatibility [chart](https://docs.nvidia.com/deploy/cuda-compatibility/index.html#binary-compatibility__table-toolkit-driver)
 for the required version of Nvidia garphics driver for your host system.
 
@@ -69,8 +79,8 @@ Images of Pytorch version 1.5 and higher include [Pytorch Lightning](https://git
 | `tf2.3` | CPU-only | [Dockerfile](docker/tf2.3/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf2.3.svg)](https://microbadger.com/images/wqael/notebooks:tf2.3) |
 | `tf2.3-cuda101` | Nvidia Driver >= 418.xx | [Dockerfile](docker/tf2.3-cuda101/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf2.3-cuda101.svg)](https://microbadger.com/images/wqael/notebooks:tf2.3-cuda101) |
 | `tf2.0.0-cuda10` | Nvidia Driver >= 410.xx | [Dockerfile](docker/tf2.0.0-cuda10/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf2.0.0-cuda10.svg)](https://microbadger.com/images/wqael/notebooks:tf2.0.0-cuda10) |
-| `tf1.15.2` | CPU-only | [Dockerfile](docker/tf1.15.2/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf1.15.2.svg)](https://microbadger.com/images/wqael/notebooks:tf1.15.2) |
-| `tf1.15.2-cuda10` | Nvidia Driver >= 410.xx | [Dockerfile](docker/tf1.15.2-cuda10/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf1.15.2-cuda10.svg)](https://microbadger.com/images/wqael/notebooks:tf1.15.2-cuda10) |
+| `tf1.15.4` | CPU-only | [Dockerfile](docker/tf1.15.4/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf1.15.4.svg)](https://microbadger.com/images/wqael/notebooks:tf1.15.4) |
+| `tf1.15.4-cuda10` | Nvidia Driver >= 410.xx | [Dockerfile](docker/tf1.15.4-cuda10/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf1.15.4-cuda10.svg)](https://microbadger.com/images/wqael/notebooks:tf1.15.4-cuda10) |
 | `jupyter-keras-tf1.12.3-py3-cuda9` | Nvidia Driver >= 384.xx | [Dockerfile](docker/jupyter-keras-tf1.12.3-py3-cuda9/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:jupyter-keras-tf1.12.3-py3-cuda9.svg)](https://microbadger.com/images/wqael/notebooks:jupyter-keras-tf1.12.3-py3-cuda9) |
 | `jupyter-keras-tf1.4.1-py3-cuda8` | Nvidia Driver >= 375.xx | [Dockerfile](docker/jupyter-keras-tf1.4.1-py3-cuda8/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:jupyter-keras-tf1.4.1-py3-cuda8.svg)](https://microbadger.com/images/wqael/notebooks:jupyter-keras-tf1.4.1-py3-cuda8) |
 

deprecated/deprecated.md

@@ -14,6 +14,8 @@
 | `tf2.0.0` | CPU-only | [Dockerfile](tf2.0.0/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf2.0.0.svg)](https://microbadger.com/images/wqael/notebooks:tf2.0.0) |
 | `tf2` | CPU. Jupyter. TF 2.0 beta1. | [Dockerfile](tf2/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf2.svg) ![](https://images.microbadger.com/badges/commit/wqael/notebooks:tf2.svg)](https://microbadger.com/images/wqael/notebooks:tf2) |
 | `tf2-gpu` | CUDA 9. Jupyter. TF 2.0 beta1. | [Dockerfile](tf2-gpu/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf2-gpu.svg) ![](https://images.microbadger.com/badges/commit/wqael/notebooks:tf2-gpu.svg)](https://microbadger.com/images/wqael/notebooks:tf2-gpu) |
+| `tf1.15.2` | CPU-only | [Dockerfile](tf1.15.2/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf1.15.2.svg)](https://microbadger.com/images/wqael/notebooks:tf1.15.2) |
+| `tf1.15.2-cuda10` | Nvidia Driver >= 410.xx | [Dockerfile](tf1.15.2-cuda10/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf1.15.2-cuda10.svg)](https://microbadger.com/images/wqael/notebooks:tf1.15.2-cuda10) |
 | `tf1.15.0` | CPU-only | [Dockerfile](tf1.15.0/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf1.15.0.svg)](https://microbadger.com/images/wqael/notebooks:tf1.15.0) |
 | `tf1.15.0-cuda10` | Nvidia Driver >= 410.xx | [Dockerfile](tf1.15.0-cuda10/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf1.15.0-cuda10.svg)](https://microbadger.com/images/wqael/notebooks:tf1.15.0-cuda10) |
 | `jupyter-keras-tf1.14.0-py3` | CPU-only | [Dockerfile](jupyter-keras-tf1.14.0-py3/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:jupyter-keras-tf1.14.0-py3.svg)](https://microbadger.com/images/wqael/notebooks:jupyter-keras-tf1.14.0-py3) |

docker/tf1.15.2-cuda10/Dockerfile renamed to deprecated/tf1.15.2-cuda10/Dockerfile

@@ -0,0 +1,60 @@
+FROM tensorflow/tensorflow:1.15.4-gpu-py3
+
+LABEL description="Jupyter / Keras 2.3.1 / Tensorflow 1.15.4 / CUDA 10.0.130 / Python 3.6.9 / Ubuntu 18.04.5 LTS" \
+      maintainer="https://github.com/rlan/notebooks"
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/rlan/notebooks" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
+
+# Avoid configuring tzdata
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends \
+        graphviz \
+        libhdf5-dev \
+        python3-pandas \
+    && apt-get -qq clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN pip --no-cache-dir install -q --upgrade \
+        pip \
+        setuptools \
+        wheel
+RUN pip --no-cache-dir --use-feature=2020-resolver install -q --upgrade \
+        h5py \
+        jupyterlab \
+        keras \
+        matplotlib \
+        nltk \
+        opencv-python-headless \
+        pillow \
+        pydot \
+        pyyaml \
+        scikit-learn \
+        scikit-image \
+        seaborn
+
+# Set up our notebook config.
+COPY jupyter_notebook_config.py /root/.jupyter/
+
+# Jupyter has issues with being run directly:
+#   https://github.com/ipython/ipython/issues/7062
+# We just add a little wrapper script.
+COPY run_jupyter.sh /
+
+# TensorBoard
+EXPOSE 6006
+# IPython
+EXPOSE 8888
+
+WORKDIR /notebooks
+
+CMD ["/run_jupyter.sh", "--allow-root"]

docker/tf1.15.2-cuda10/hooks/build renamed to deprecated/tf1.15.2-cuda10/hooks/build

@@ -0,0 +1,5 @@
+#!/bin/bash
+# $IMAGE_NAME var is injected into the build so the tag is correct. 
+docker build --build-arg VCS_REF=`git rev-parse --short HEAD` \
+  --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
+  -t $IMAGE_NAME .

docker/tf1.15.2-cuda10/jupyter_notebook_config.py renamed to deprecated/tf1.15.2-cuda10/jupyter_notebook_config.py

@@ -0,0 +1,18 @@
+import os
+from IPython.lib import passwd
+
+c = c  # pylint:disable=undefined-variable
+c.NotebookApp.ip = '0.0.0.0'
+c.NotebookApp.port = int(os.getenv('PORT', 8888))
+c.NotebookApp.open_browser = False
+
+# sets a password if PASSWORD is set in the environment
+if 'PASSWORD' in os.environ:
+  password = os.environ['PASSWORD']
+  if password:
+    c.NotebookApp.password = passwd(password)
+  else:
+    c.NotebookApp.password = ''
+    c.NotebookApp.token = ''
+  del os.environ['PASSWORD']
+  

docker/tf1.15.2-cuda10/run_jupyter.sh renamed to deprecated/tf1.15.2-cuda10/run_jupyter.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+jupyter notebook "$@"

docker/tf1.15.2/Dockerfile renamed to deprecated/tf1.15.2/Dockerfile

@@ -0,0 +1,60 @@
+FROM tensorflow/tensorflow:1.15.4-py3
+
+LABEL description="Jupyter / Keras 2.3.1 / Tensorflow 1.15.4 / Python 3.6.9 / Ubuntu 18.04.5 LTS" \
+      maintainer="https://github.com/rlan/notebooks"
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/rlan/notebooks" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
+
+# Avoid configuring tzdata
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends \
+        graphviz \
+        libhdf5-dev \
+        python3-pandas \
+    && apt-get -qq clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN pip --no-cache-dir install -q --upgrade \
+        pip \
+        setuptools \
+        wheel
+RUN pip --no-cache-dir --use-feature=2020-resolver install -q --upgrade \
+        h5py \
+        jupyterlab \
+        keras \
+        matplotlib \
+        nltk \
+        opencv-python-headless \
+        pillow \
+        pydot \
+        pyyaml \
+        scikit-learn \
+        scikit-image \
+        seaborn
+
+# Set up our notebook config.
+COPY jupyter_notebook_config.py /root/.jupyter/
+
+# Jupyter has issues with being run directly:
+#   https://github.com/ipython/ipython/issues/7062
+# We just add a little wrapper script.
+COPY run_jupyter.sh /
+
+# TensorBoard
+EXPOSE 6006
+# IPython
+EXPOSE 8888
+
+WORKDIR /notebooks
+
+CMD ["/run_jupyter.sh", "--allow-root"]

docker/tf1.15.2/hooks/build renamed to deprecated/tf1.15.2/hooks/build

@@ -0,0 +1,5 @@
+#!/bin/bash
+# $IMAGE_NAME var is injected into the build so the tag is correct. 
+docker build --build-arg VCS_REF=`git rev-parse --short HEAD` \
+  --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
+  -t $IMAGE_NAME .

docker/tf1.15.2/jupyter_notebook_config.py renamed to deprecated/tf1.15.2/jupyter_notebook_config.py

@@ -0,0 +1,18 @@
+import os
+from IPython.lib import passwd
+
+c = c  # pylint:disable=undefined-variable
+c.NotebookApp.ip = '0.0.0.0'
+c.NotebookApp.port = int(os.getenv('PORT', 8888))
+c.NotebookApp.open_browser = False
+
+# sets a password if PASSWORD is set in the environment
+if 'PASSWORD' in os.environ:
+  password = os.environ['PASSWORD']
+  if password:
+    c.NotebookApp.password = passwd(password)
+  else:
+    c.NotebookApp.password = ''
+    c.NotebookApp.token = ''
+  del os.environ['PASSWORD']
+  

docker/tf1.15.2/run_jupyter.sh renamed to deprecated/tf1.15.2/run_jupyter.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+jupyter notebook "$@"