Merge pull request #38 from harshjv/master

Follow best practices for Dockerfile
This commit is contained in:
Brandon Amos 2015-10-28 09:18:25 -04:00
commit ce506d4f5c
2 changed files with 7 additions and 5 deletions

View File

@ -484,7 +484,7 @@ To use, place your images in `openface` on your host and
access them from the shared Docker directory.
```
docker build -t openface .
docker build -t openface ./docker
docker run -t -i -v $PWD:/openface openface /bin/bash
cd /openface
./demos/compare.py images/examples/{lennon*,clapton*}
@ -505,7 +505,7 @@ eval $(docker-machine env default)
## By hand
Be sure you have checked out the submodules and downloaded the models as
described above.
See the [Dockerfile](Dockerfile) as a reference.
See the [Dockerfile](docker/Dockerfile) as a reference.
This project uses `python2` because of the `opencv`
and `dlib` dependencies.

View File

@ -1,7 +1,7 @@
FROM ubuntu:14.04
MAINTAINER Brandon Amos <brandon.amos.cs@gmail.com>
RUN apt-get update
RUN apt-get install -y \
RUN apt-get update && apt-get install -y \
build-essential \
cmake \
curl \
@ -19,7 +19,9 @@ RUN apt-get install -y \
python-dev \
python-pip \
wget \
zip
zip \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN pip2 install numpy scipy pandas
RUN pip2 install scikit-learn scikit-image