Docker refresh #5153
Docker refresh #5153
Conversation
| # FIXME: clone a specific git tag and use ARG instead of ENV once DockerHub supports this. | ||
| ENV CLONE_TAG=master | ||
| # FIXME: use ARG instead of ENV once DockerHub supports this | ||
| ENV CLONE_TAG=1.0.0-rc4 |
There was a problem hiding this comment.
That's not a valid bvlc/caffe tag, right?
| @@ -1,4 +1,4 @@ | |||
| FROM ubuntu:14.04 | |||
| FROM ubuntu:16.04 | |||
| MAINTAINER [email protected] | |||
There was a problem hiding this comment.
MAINTAINER is being deprecated in Docker 1.13, you should use a label instead, might as well change it now.
You can use something like this instead.
| # FIXME: clone a specific git tag and use ARG instead of ENV once DockerHub supports this. | ||
| ENV CLONE_TAG=master | ||
| # FIXME: use ARG instead of ENV once DockerHub supports this | ||
| ENV CLONE_TAG=1.0.0-rc4 |
| @@ -1,4 +1,4 @@ | |||
| FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 | |||
| FROM nvidia/cuda:8.0-cudnn5-devel-ubuntu16.04 | |||
| MAINTAINER [email protected] | |||
| for req in $(cat python/requirements.txt) pydot; do pip install $req; done && \ | ||
| pip install --upgrade pip && \ | ||
| cd python && for req in $(cat requirements.txt) pydot; do pip install $req; done && cd .. && \ | ||
| git clone https://github.com/NVIDIA/nccl.git && cd nccl && make -j install && cd .. && \ |
There was a problem hiding this comment.
You should probably remove the NCCL directory after install, to save space.
|
Thanks @flx42 should be good now |
|
@cypof what about the |
|
I pushed a tag, it should be there |
|
Great, LGTM then. |
|
Actually, not LGTM. |
|
Ah yes, I was assuming nccl would make it. I just refreshed #4563 history so it should be ready now. Let's wait until it goes in. |
|
Now that #4563 was merged, you should create a new tag ( |
|
Dropping the Makefile seems fine as long as the docs clearly explain how to build the images yourself for those who want to work with their own branches. |
|
Yes this PR improves the readme too. It's simpler to get started and it shows how to build the images. I think this is good to go, I will make sure to update the tag as soon as we have an official rc4. |
|
Pointing to rc4 now. |
|
LGTM |
|
@cypof feel free to merge when ready |
Docker refresh: simplified & update to 16.04, cuda8, cudnn5, nccl
I'd like to have an official image for Caffe, so updated the builds to the latest Ubuntu, CUDA and cuDNN, and added NCCL. Also I'm not sure I see the point of maintaining the docker Makefile and templates now that images build automatically, so I tentatively removed them.