diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2017-04-14 17:03:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-14 17:03:51 -0700 |
| commit | a7a7d3082bc43284abbc62f71e45201ccc987c75 (patch) | |
| tree | 7f6d8d3391f4185b9d31b1790d88f89f052806f4 | |
| parent | 946c9b890080eabcf44c4b07f7319fed3d14fde9 (diff) | |
| parent | 4db619aec9cd384b11a1c55fac257d14b704bb15 (diff) | |
| download | caffe-a7a7d3082bc43284abbc62f71e45201ccc987c75.tar.gz caffe-a7a7d3082bc43284abbc62f71e45201ccc987c75.tar.bz2 caffe-a7a7d3082bc43284abbc62f71e45201ccc987c75.zip | |
Merge pull request #5536 from cypof/docker_cudnn6
Docker update to cuDNN 6
| -rw-r--r-- | docker/cpu/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/gpu/Dockerfile | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docker/cpu/Dockerfile b/docker/cpu/Dockerfile index af6c03c6..67e2e61b 100644 --- a/docker/cpu/Dockerfile +++ b/docker/cpu/Dockerfile @@ -28,7 +28,8 @@ ENV CAFFE_ROOT=/opt/caffe WORKDIR $CAFFE_ROOT # FIXME: use ARG instead of ENV once DockerHub supports this -ENV CLONE_TAG=rc4 +# https://github.com/docker/hub-feedback/issues/460 +ENV CLONE_TAG=1.0 RUN git clone -b ${CLONE_TAG} --depth 1 https://github.com/BVLC/caffe.git . && \ pip install --upgrade pip && \ diff --git a/docker/gpu/Dockerfile b/docker/gpu/Dockerfile index 0785b10f..dcdbdf32 100644 --- a/docker/gpu/Dockerfile +++ b/docker/gpu/Dockerfile @@ -1,4 +1,4 @@ -FROM nvidia/cuda:8.0-cudnn5-devel-ubuntu16.04 +FROM nvidia/cuda:8.0-cudnn6-devel-ubuntu16.04 LABEL maintainer caffe-maint@googlegroups.com RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -28,7 +28,8 @@ ENV CAFFE_ROOT=/opt/caffe WORKDIR $CAFFE_ROOT # FIXME: use ARG instead of ENV once DockerHub supports this -ENV CLONE_TAG=rc4 +# https://github.com/docker/hub-feedback/issues/460 +ENV CLONE_TAG=1.0 RUN git clone -b ${CLONE_TAG} --depth 1 https://github.com/BVLC/caffe.git . && \ pip install --upgrade pip && \ |