clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 17:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3598 from tianon/fix-vieux-docs-errors-again

Browse Source 
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
This commit is contained in:
Andy Rothfusz
2014-01-15 13:42:28 -08:00
parent 0113c087b2 eaa9c85511
commit cdea7d3b5f
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/Dockerfile
+13 -14
View File
@@ -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