-
Notifications
You must be signed in to change notification settings - Fork 18.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix odd issues with "make docs", add "make docs-shell", and canonical…
…ize our docs Dockerfile a bit more Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
- Loading branch information
Showing
2 changed files
with
21 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,19 @@ | ||
from ubuntu:12.04 | ||
maintainer Nick Stinemates | ||
FROM stackbrew/ubuntu:12.04 | ||
MAINTAINER Nick Stinemates | ||
# | ||
# docker build -t docker:docs . && docker run -p 8000:8000 docker:docs | ||
# | ||
|
||
run apt-get update | ||
run apt-get install -y python-setuptools make | ||
run easy_install pip | ||
#from docs/requirements.txt, but here to increase cacheability | ||
run pip install --no-use-wheel Sphinx==1.1.3 | ||
run pip install --no-use-wheel sphinxcontrib-httpdomain==1.1.9 | ||
add . /docs | ||
run cd /docs; make docs | ||
# TODO switch to http://packages.ubuntu.com/trusty/python-sphinxcontrib-httpdomain once trusty is released | ||
|
||
expose 8000 | ||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq make python-pip python-setuptools | ||
# pip installs from docs/requirements.txt, but here to increase cacheability | ||
RUN pip install Sphinx==1.1.3 | ||
RUN pip install sphinxcontrib-httpdomain==1.1.9 | ||
ADD . /docs | ||
RUN make -C /docs clean docs | ||
|
||
workdir /docs/_build/html | ||
|
||
entrypoint ["python", "-m", "SimpleHTTPServer"] | ||
WORKDIR /docs/_build/html | ||
CMD ["python", "-m", "SimpleHTTPServer"] | ||
# note, EXPOSE is only last because of https://github.com/dotcloud/docker/issues/3525 | ||
EXPOSE 8000 |