diff options
| author |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-08-03 15:06:07 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-08-03 15:06:18 -0700 |
| commit | da0634af0e4af3e670350a590e569a7a31494bc7 (patch) | |
| tree | 21d488319366d3890090c6c6033b17c1fda22a9e /tensorflow/tools/docker | |
| parent | 5a5e42e5756987e5f0525379ab75d00c81b70d00 (diff) | |
| parent | e5b24e83ec7c307a62a2ff807df0149df5605387 (diff) | |
Merge pull request #21282 from av8ramit:merge_r110_back
PiperOrigin-RevId: 207329479
Diffstat (limited to 'tensorflow/tools/docker')
| -rw-r--r-- | tensorflow/tools/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | tensorflow/tools/docker/Dockerfile.devel | 4 | ||||
| -rw-r--r-- | tensorflow/tools/docker/Dockerfile.devel-gpu | 4 | ||||
| -rwxr-xr-x | tensorflow/tools/docker/Dockerfile.devel-mkl | 2 | ||||
| -rw-r--r-- | tensorflow/tools/docker/Dockerfile.gpu | 2 |
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 5b0051c1d4..f0c7118ecb 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 \ |