summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2016-09-06 10:27:35 -0700
committerGitHub <noreply@github.com>2016-09-06 10:27:35 -0700
commitd9e868ab7425185a2aa55c9c1416f104513a6e62 (patch)
tree926045f80e1a953b6bea76e7ad51716eba3dc730
parentfff71e9dbff873e6ccb25c75f6763307e3d17f02 (diff)
parent291470146f7264148997bda2a57124352fd04769 (diff)
downloaddocker-py-d9e868ab7425185a2aa55c9c1416f104513a6e62.tar.gz
Merge pull request #1185 from bfirsh/make-docs
Add make docs command for building docs
-rw-r--r--Dockerfile-docs9
-rw-r--r--Makefile6
-rw-r--r--docs-requirements.txt2
3 files changed, 16 insertions, 1 deletions
diff --git a/Dockerfile-docs b/Dockerfile-docs
new file mode 100644
index 0000000..1103ffd
--- /dev/null
+++ b/Dockerfile-docs
@@ -0,0 +1,9 @@
+FROM python:2.7
+
+RUN mkdir /home/docker-py
+WORKDIR /home/docker-py
+
+COPY docs-requirements.txt /home/docker-py/docs-requirements.txt
+RUN pip install -r docs-requirements.txt
+
+COPY . /home/docker-py
diff --git a/Makefile b/Makefile
index a635edf..3a8f5e8 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ build:
build-py3:
docker build -t docker-py3 -f Dockerfile-py3 .
+build-docs:
+ docker build -t docker-py-docs -f Dockerfile-docs .
+
build-dind-certs:
docker build -t dpy-dind-certs -f tests/Dockerfile-dind-certs .
@@ -57,3 +60,6 @@ integration-dind-ssl: build-dind-certs build build-py3
flake8: build
docker run docker-py flake8 docker tests
+
+docs: build-docs
+ docker run -v `pwd`/docs:/home/docker-py/docs/ -p 8000:8000 docker-py-docs mkdocs serve -a 0.0.0.0:8000
diff --git a/docs-requirements.txt b/docs-requirements.txt
index abc8d72..aede1cb 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1 +1 @@
-mkdocs==0.9
+mkdocs==0.15.3