Skip to content

Commit 56095cf

Browse files
author
Rick Lan
committed
Fixes #50
1 parent ec665e6 commit 56095cf

File tree

20 files changed

+176
-6
lines changed

20 files changed

+176
-6
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ If you are reading this page from [Docker Hub](https://hub.docker.com/r/wqael/no
2929

3030
| Tag | Comment | Dockerfile | Info |
3131
| ----- | ------- | ---------- | ---- |
32-
| `latest` | CPU-only. Jupyter. PyTorch 1.4, Keras, TF 1.15.0. | [Dockerfile](docker/latest/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:latest.svg)](https://microbadger.com/images/wqael/notebooks:latest) |
33-
| `latest-gpu` | CUDA 10.1. Jupyter. PyTorch 1.4, Keras, TF 1.15.0. | [Dockerfile](docker/latest-gpu/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:latest-gpu.svg)](https://microbadger.com/images/wqael/notebooks:latest-gpu) |
32+
| `latest` | CPU-only. Jupyter. PyTorch 1.4, Keras, TF 1.15.2. | [Dockerfile](docker/latest/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:latest.svg)](https://microbadger.com/images/wqael/notebooks:latest) |
33+
| `latest-gpu` | CUDA 10.1. Jupyter. PyTorch 1.4, Keras, TF 1.15.2. | [Dockerfile](docker/latest-gpu/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:latest-gpu.svg)](https://microbadger.com/images/wqael/notebooks:latest-gpu) |
3434

3535

3636
### [Caffe](https://caffe2.ai/)
@@ -68,8 +68,8 @@ If you are reading this page from [Docker Hub](https://hub.docker.com/r/wqael/no
6868
| `tf2.1.0` | CPU-only | [Dockerfile](docker/tf2.1.0/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf2.1.0.svg)](https://microbadger.com/images/wqael/notebooks:tf2.1.0) |
6969
| `tf2.1.0-cuda101` | Nvidia Driver >= 418.xx | [Dockerfile](docker/tf2.1.0-cuda101/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:tf2.1.0-cuda101.svg)](https://microbadger.com/images/wqael/notebooks:tf2.1.0-cuda101) |
7070
| `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) |
71-
| `tf1.15.0` | CPU-only | [Dockerfile](docker/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) |
72-
| `tf1.15.0-cuda10` | Nvidia Driver >= 410.xx | [Dockerfile](docker/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) |
71+
| `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) |
72+
| `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) |
7373
| `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) |
7474
| `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) |
7575

deprecated/deprecated.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
| `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) |
1111
| `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) |
1212
| `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) |
13+
| `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) |
14+
| `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) |
1315
| `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) |
1416
| `jupyter-keras-tf1.14.0-py3-cuda10` | Nvidia Driver >= 410.xx | [Dockerfile](jupyter-keras-tf1.14.0-py3-cuda10/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:jupyter-keras-tf1.14.0-py3-cuda10.svg)](https://microbadger.com/images/wqael/notebooks:jupyter-keras-tf1.14.0-py3-cuda10) |
1517
| `jupyter-keras-tf1.13.1-py3` | CPU-only | [Dockerfile](jupyter-keras-tf1.13.1-py3/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:jupyter-keras-tf1.13.1-py3.svg) ![](https://images.microbadger.com/badges/commit/wqael/notebooks:jupyter-keras-tf1.13.1-py3.svg)](https://microbadger.com/images/wqael/notebooks:jupyter-keras-tf1.13.1-py3) |
File renamed without changes.
File renamed without changes.
File renamed without changes.

docker/latest-gpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM wqael/mldock:latest-gpu
22

3-
LABEL description="PyTorch 1.4 / Keras 2.3.1 / TensorFlow 1.15.0 / Python 3.5 / Nvidia CUDA 10.1 / Ubuntu 16.04" \
3+
LABEL description="PyTorch 1.4 / Keras 2.3.1 / TensorFlow 1.15.2 / Python 3.5 / Nvidia CUDA 10.1 / Ubuntu 16.04" \
44
maintainer="https://github.com/rlan/notebooks"
55

66

docker/latest/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM wqael/mldock:latest
22

3-
LABEL description="PyTorch 1.4 / Keras 2.3.1 / tensorflow/tensorflow:1.15.0-py3 (Python 3.6.8 / Ubuntu 16.04.5 LTS)" \
3+
LABEL description="PyTorch 1.4 / Keras 2.3.1 / tensorflow/tensorflow:1.15.2-py3 (Python 3.6.8 / Ubuntu 16.04.5 LTS)" \
44
maintainer="https://github.com/rlan/notebooks"
55

66

docker/tf1.15.2-cuda10/Dockerfile

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
FROM tensorflow/tensorflow:1.15.2-gpu-py3
2+
3+
LABEL description="Jupyter / Keras 2.3.1 / Tensorflow 1.15.2 / CUDA 10.0.130 / Python 3 / Ubuntu 16.04" \
4+
maintainer="https://github.com/rlan/notebooks"
5+
6+
# Build-time metadata as defined at http://label-schema.org
7+
ARG BUILD_DATE
8+
ARG VCS_REF
9+
ARG VERSION
10+
LABEL org.label-schema.build-date=$BUILD_DATE \
11+
org.label-schema.vcs-ref=$VCS_REF \
12+
org.label-schema.vcs-url="https://github.com/rlan/notebooks" \
13+
org.label-schema.version=$VERSION \
14+
org.label-schema.schema-version="1.0"
15+
16+
# Avoid configuring tzdata
17+
ARG DEBIAN_FRONTEND=noninteractive
18+
19+
RUN apt-get -qq update \
20+
&& apt-get -qq install -y --no-install-recommends \
21+
graphviz \
22+
libhdf5-dev \
23+
python3-pandas \
24+
&& apt-get -qq clean \
25+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
26+
27+
RUN pip --no-cache-dir install -q --upgrade \
28+
pip \
29+
setuptools \
30+
wheel
31+
RUN pip --no-cache-dir install -q --upgrade \
32+
h5py \
33+
jupyterlab \
34+
keras \
35+
matplotlib \
36+
opencv-python-headless \
37+
pillow \
38+
pydot \
39+
pyyaml \
40+
scikit-learn \
41+
scikit-image \
42+
seaborn
43+
44+
# Set up our notebook config.
45+
COPY jupyter_notebook_config.py /root/.jupyter/
46+
47+
# Jupyter has issues with being run directly:
48+
# https://github.com/ipython/ipython/issues/7062
49+
# We just add a little wrapper script.
50+
COPY run_jupyter.sh /
51+
52+
# TensorBoard
53+
EXPOSE 6006
54+
# IPython
55+
EXPOSE 8888
56+
57+
WORKDIR /notebooks
58+
59+
CMD ["/run_jupyter.sh", "--allow-root"]

docker/tf1.15.2-cuda10/hooks/build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
# $IMAGE_NAME var is injected into the build so the tag is correct.
3+
docker build --build-arg VCS_REF=`git rev-parse --short HEAD` \
4+
--build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
5+
-t $IMAGE_NAME .
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import os
2+
from IPython.lib import passwd
3+
4+
c = c # pylint:disable=undefined-variable
5+
c.NotebookApp.ip = '0.0.0.0'
6+
c.NotebookApp.port = int(os.getenv('PORT', 8888))
7+
c.NotebookApp.open_browser = False
8+
9+
# sets a password if PASSWORD is set in the environment
10+
if 'PASSWORD' in os.environ:
11+
password = os.environ['PASSWORD']
12+
if password:
13+
c.NotebookApp.password = passwd(password)
14+
else:
15+
c.NotebookApp.password = ''
16+
c.NotebookApp.token = ''
17+
del os.environ['PASSWORD']
18+

docker/tf1.15.2-cuda10/run_jupyter.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
jupyter notebook "$@"

docker/tf1.15.2/Dockerfile

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
FROM tensorflow/tensorflow:1.15.2-py3
2+
3+
LABEL description="Jupyter / Keras 2.3.1 / Tensorflow 1.15.2 / Python 3 / Ubuntu 16.04" \
4+
maintainer="https://github.com/rlan/notebooks"
5+
6+
# Build-time metadata as defined at http://label-schema.org
7+
ARG BUILD_DATE
8+
ARG VCS_REF
9+
ARG VERSION
10+
LABEL org.label-schema.build-date=$BUILD_DATE \
11+
org.label-schema.vcs-ref=$VCS_REF \
12+
org.label-schema.vcs-url="https://github.com/rlan/notebooks" \
13+
org.label-schema.version=$VERSION \
14+
org.label-schema.schema-version="1.0"
15+
16+
# Avoid configuring tzdata
17+
ARG DEBIAN_FRONTEND=noninteractive
18+
19+
RUN apt-get -qq update \
20+
&& apt-get -qq install -y --no-install-recommends \
21+
graphviz \
22+
libhdf5-dev \
23+
python3-pandas \
24+
&& apt-get -qq clean \
25+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
26+
27+
RUN pip --no-cache-dir install -q --upgrade \
28+
pip \
29+
setuptools \
30+
wheel
31+
RUN pip --no-cache-dir install -q --upgrade \
32+
h5py \
33+
jupyterlab \
34+
keras \
35+
matplotlib \
36+
opencv-python-headless \
37+
pillow \
38+
pydot \
39+
pyyaml \
40+
scikit-learn \
41+
scikit-image \
42+
seaborn
43+
44+
# Set up our notebook config.
45+
COPY jupyter_notebook_config.py /root/.jupyter/
46+
47+
# Jupyter has issues with being run directly:
48+
# https://github.com/ipython/ipython/issues/7062
49+
# We just add a little wrapper script.
50+
COPY run_jupyter.sh /
51+
52+
# TensorBoard
53+
EXPOSE 6006
54+
# IPython
55+
EXPOSE 8888
56+
57+
WORKDIR /notebooks
58+
59+
CMD ["/run_jupyter.sh", "--allow-root"]

docker/tf1.15.2/hooks/build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
# $IMAGE_NAME var is injected into the build so the tag is correct.
3+
docker build --build-arg VCS_REF=`git rev-parse --short HEAD` \
4+
--build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
5+
-t $IMAGE_NAME .
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import os
2+
from IPython.lib import passwd
3+
4+
c = c # pylint:disable=undefined-variable
5+
c.NotebookApp.ip = '0.0.0.0'
6+
c.NotebookApp.port = int(os.getenv('PORT', 8888))
7+
c.NotebookApp.open_browser = False
8+
9+
# sets a password if PASSWORD is set in the environment
10+
if 'PASSWORD' in os.environ:
11+
password = os.environ['PASSWORD']
12+
if password:
13+
c.NotebookApp.password = passwd(password)
14+
else:
15+
c.NotebookApp.password = ''
16+
c.NotebookApp.token = ''
17+
del os.environ['PASSWORD']
18+

docker/tf1.15.2/run_jupyter.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
jupyter notebook "$@"

0 commit comments

Comments
 (0)