Skip to content

Commit

Permalink
Docker: Bump dependency version. Remove src.
Browse files Browse the repository at this point in the history
For #133.
  • Loading branch information
Brandon Amos committed May 6, 2016
1 parent 9c4fd0f commit 4c0522f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bamos/ubuntu-opencv-dlib-torch:ubuntu_14.04-opencv_2.4.11-dlib_18.16-torch_2016.03.19
FROM bamos/ubuntu-opencv-dlib-torch:ubuntu_14.04-opencv_2.4.11-dlib_18.16-torch_2016.05.06
MAINTAINER Brandon Amos <brandon.amos.cs@gmail.com>

RUN apt-get update && apt-get install -y \
Expand All @@ -16,13 +16,13 @@ RUN apt-get update && apt-get install -y \
zip \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

ADD . /root/src/openface
RUN cd ~/src/openface && \
ADD . /root/openface
RUN cd ~/openface && \
./models/get-models.sh && \
pip2 install -r requirements.txt && \
python2 setup.py install && \
pip2 install -r demos/web/requirements.txt && \
pip2 install -r training/requirements.txt

EXPOSE 8000 9000
CMD /bin/bash -l -c '/root/src/openface/demos/web/start-servers.sh'
CMD /bin/bash -l -c '/root/openface/demos/web/start-servers.sh'
2 changes: 1 addition & 1 deletion docs/demo-1-web.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Start the HTTP and WebSocket servers on ports 8000 and 9000 in the
Docker container with:

```
docker run -p 9000:9000 -p 8000:8000 -t -i bamos/openface /bin/bash -l -c '/root/src/openface/demos/web/start-servers.sh'
docker run -p 9000:9000 -p 8000:8000 -t -i bamos/openface /bin/bash -l -c '/root/openface/demos/web/start-servers.sh'
```

Then find the IP address of the container and access the demo
Expand Down
4 changes: 2 additions & 2 deletions docs/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ host and the Docker container.
```
docker pull bamos/openface
docker run -p 9000:9000 -p 8000:8000 -t -i bamos/openface /bin/bash
cd /root/src/openface
cd /root/openface
./demos/compare.py images/examples/{lennon*,clapton*}
./demos/classifier.py infer models/openface/celeb-classifier.nn4.small2.v1.pkl ./images/examples/carell.jpg
./demos/web/start-servers.sh
Expand All @@ -53,7 +53,7 @@ Run the following commands from the `openface` directory.
```
docker build -t openface .
docker run -p 9000:9000 -p 8000:8000 -t -i openface /bin/bash
cd /root/src/openface
cd /root/openface
./run-tests.sh
./demos/compare.py images/examples/{lennon*,clapton*}
./demos/classifier.py infer models/openface/celeb-classifier.nn4.small2.v1.pkl ./images/examples/carell.jpg
Expand Down

0 comments on commit 4c0522f

Please sign in to comment.