From a9ba30fa7952533d74c19188e616919901e2fada Mon Sep 17 00:00:00 2001 From: PJ Dietz Date: Mon, 12 Mar 2018 11:03:26 -0400 Subject: [PATCH] Add "docs" service to for generating documentation with Sphinx --- docker-compose.yml | 9 ++++++++- docker/docs/Dockerfile | 7 +++++++ docker/{ => php}/Dockerfile | 2 +- docker/{ => php}/install-composer.sh | 0 docs/source/conf.py | 1 - 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 docker/docs/Dockerfile rename docker/{ => php}/Dockerfile (94%) rename docker/{ => php}/install-composer.sh (100%) diff --git a/docker-compose.yml b/docker-compose.yml index c264c3c..b4ac5c5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,13 @@ services: php: build: context: . - dockerfile: ./docker/Dockerfile + dockerfile: ./docker/php/Dockerfile volumes: - .:/usr/local/src/wellrested + + docs: + build: + context: . + dockerfile: ./docker/docs/Dockerfile + volumes: + - .:/usr/local/src/wellrested \ No newline at end of file diff --git a/docker/docs/Dockerfile b/docker/docs/Dockerfile new file mode 100644 index 0000000..104e1dc --- /dev/null +++ b/docker/docs/Dockerfile @@ -0,0 +1,7 @@ +FROM python:3-jessie + +RUN pip install sphinx sphinx_rtd_theme + +WORKDIR /usr/local/src/wellrested + +CMD ["make", "html", "-C", "docs"] \ No newline at end of file diff --git a/docker/Dockerfile b/docker/php/Dockerfile similarity index 94% rename from docker/Dockerfile rename to docker/php/Dockerfile index b525857..4eedb78 100644 --- a/docker/Dockerfile +++ b/docker/php/Dockerfile @@ -15,7 +15,7 @@ RUN yes | pecl install xdebug \ && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini # Download and install Composer -COPY ./docker/install-composer.sh /tmp/install-composer.sh +COPY ./docker/php/install-composer.sh /tmp/install-composer.sh RUN chmod +x /tmp/install-composer.sh; sync && \ /tmp/install-composer.sh && \ rm /tmp/install-composer.sh diff --git a/docker/install-composer.sh b/docker/php/install-composer.sh similarity index 100% rename from docker/install-composer.sh rename to docker/php/install-composer.sh diff --git a/docs/source/conf.py b/docs/source/conf.py index fcb310e..456bd18 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -6,7 +6,6 @@ from pygments.lexers.web import PhpLexer lexers['php'] = PhpLexer(startinline=True, linenos=1) lexers['php-annotations'] = PhpLexer(startinline=True, linenos=1) -primary_domain = 'php' # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom