aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/tools/docker
diff options
context:
space:
mode:
authorGravatar Amit Patankar <amitpatankar@google.com>2018-07-31 10:53:01 -0700
committerGravatar Amit Patankar <amitpatankar@google.com>2018-07-31 10:53:01 -0700
commitf9410ac2e50d961adbea6b4805f82da90116bebe (patch)
tree700a9ba1039891b8e87eab9d440ad8fd2f412246 /tensorflow/tools/docker
parentcd4fccda8b60bda2b36859b4a4e7eae37ed54cce (diff)
Merging the r1.10 branch back to master.
Diffstat (limited to 'tensorflow/tools/docker')
-rw-r--r--tensorflow/tools/docker/Dockerfile2
-rw-r--r--tensorflow/tools/docker/Dockerfile.devel4
-rw-r--r--tensorflow/tools/docker/Dockerfile.devel-gpu4
-rwxr-xr-xtensorflow/tools/docker/Dockerfile.devel-mkl2
-rw-r--r--tensorflow/tools/docker/Dockerfile.gpu2
5 files changed, 7 insertions, 7 deletions
diff --git a/tensorflow/tools/docker/Dockerfile b/tensorflow/tools/docker/Dockerfile
index a3ff8211e3..bf06214009 100644
--- a/tensorflow/tools/docker/Dockerfile
+++ b/tensorflow/tools/docker/Dockerfile
@@ -30,7 +30,7 @@ RUN pip --no-cache-dir install \
ipykernel \
jupyter \
matplotlib \
- numpy \
+ numpy==1.14.5 \
pandas \
scipy \
sklearn \
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index f7fe4119da..6552588fac 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -35,7 +35,7 @@ RUN pip --no-cache-dir install \
jupyter \
matplotlib \
mock \
- numpy \
+ numpy==1.14.5 \
scipy \
sklearn \
pandas \
@@ -76,7 +76,7 @@ RUN mkdir /bazel && \
# Download and build TensorFlow.
WORKDIR /tensorflow
-RUN git clone --branch=r1.9 --depth=1 https://github.com/tensorflow/tensorflow.git .
+RUN git clone --branch=r1.10 --depth=1 https://github.com/tensorflow/tensorflow.git .
# TODO(craigcitro): Don't install the pip package, since it makes it
# more difficult to experiment with local changes. Instead, just add
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 340f96df48..f4c83f85d4 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -51,7 +51,7 @@ RUN pip --no-cache-dir install \
jupyter \
matplotlib \
mock \
- numpy \
+ numpy==1.14.5 \
scipy \
sklearn \
pandas \
@@ -92,7 +92,7 @@ RUN mkdir /bazel && \
# Download and build TensorFlow.
WORKDIR /tensorflow
-RUN git clone --branch=r1.9 --depth=1 https://github.com/tensorflow/tensorflow.git .
+RUN git clone --branch=r1.10 --depth=1 https://github.com/tensorflow/tensorflow.git .
# Configure the build for our CUDA configuration.
ENV CI_BUILD_PYTHON python
diff --git a/tensorflow/tools/docker/Dockerfile.devel-mkl b/tensorflow/tools/docker/Dockerfile.devel-mkl
index c85641b383..7afa537c9d 100755
--- a/tensorflow/tools/docker/Dockerfile.devel-mkl
+++ b/tensorflow/tools/docker/Dockerfile.devel-mkl
@@ -3,7 +3,7 @@ FROM ubuntu:16.04
LABEL maintainer="Clayne Robison <clayne.b.robison@intel.com>"
# These parameters can be overridden by parameterized_docker_build.sh
-ARG TF_BUILD_VERSION=r1.9
+ARG TF_BUILD_VERSION=r1.10
ARG PYTHON="python"
ARG PYTHON3_DEV=""
ARG WHL_DIR="/tmp/pip"
diff --git a/tensorflow/tools/docker/Dockerfile.gpu b/tensorflow/tools/docker/Dockerfile.gpu
index 28d4371da3..5ec1e60f00 100644
--- a/tensorflow/tools/docker/Dockerfile.gpu
+++ b/tensorflow/tools/docker/Dockerfile.gpu
@@ -38,7 +38,7 @@ RUN pip --no-cache-dir install \
ipykernel \
jupyter \
matplotlib \
- numpy \
+ numpy==1.14.5 \
pandas \
scipy \
sklearn \