Consolidated docker files

CONTRIBUTING.rst

@@ -97,7 +97,8 @@ Open a terminal at the project root and run the following for to activate all se
 
     $ docker compose -f docker-compose.local.yml up
 
-The site should start and be accessible at http://localhost:3000, with the api visible at http://localhost:8000/api.
+The site should start and be accessible at http://localhost:3000, with the api visible
+at http://localhost:8000/api/ and the documentation at http://localhost:9000.
 
 You can also set the environment variable ``COMPOSE_FILE`` pointing to ``docker-compose.local.yml`` like this::
 
@@ -119,10 +120,6 @@ To run in a detached (background) mode, just::
 
     $ docker compose up -d
 
-These commands don't run the docs service. In order to run docs service you can run::
-
-    $ docker compose -f docker-compose.docs.yml up
-
 
 Execute Management Commands
 ---------------------------

compose/local/django/Dockerfile

@@ -47,6 +47,8 @@ RUN groupadd --gid 1000 dev-user \
 
 # Install required system dependencies
 RUN apt-get update && apt-get install --no-install-recommends -y \
+  # To run the Makefile for docs
+  make \
   # psycopg dependencies
   libpq-dev \
   # Translations dependencies
@@ -74,6 +76,10 @@ RUN sed -i 's/\r$//g' /start
 RUN chmod +x /start
 
 
+COPY ./compose/local/django/start-docs /start-docs
+RUN sed -i 's/\r$//g' /start-docs
+RUN chmod +x /start-docs
+
 COPY ./compose/local/django/celery/worker/start /start-celeryworker
 RUN sed -i 's/\r$//g' /start-celeryworker
 RUN chmod +x /start-celeryworker

compose/local/docs/start → compose/local/django/start-docs

@@ -4,4 +4,5 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+cd docs/
 exec make livehtml

docker-compose.local.yml

@@ -5,7 +5,7 @@ volumes:
   democrasite_local_postgres_data_backups: {}
 
 services:
-  django:
+  django: &django
     build:
       context: .
       dockerfile: ./compose/local/django/Dockerfile
@@ -38,35 +38,36 @@ services:
     env_file:
       - ./.envs/.local/.postgres
 
+  docs:
+    <<: *django
+    image: democrasite_local_docs
+    container_name: democrasite-local-docs
+    volumes:
+      - .:/app:z
+    ports:
+      - "9000:9000"
+    command: /start-docs
+    healthcheck: {}
+
   redis:
     image: docker.io/redis:6
     container_name: democrasite-local-redis
 
   celeryworker: &celery
-    build:
-      context: .
-      dockerfile: ./compose/local/django/Dockerfile
+    <<: *django
     image: democrasite_local_celeryworker
     container_name: democrasite-local-celeryworker
     depends_on:
       - redis
       - postgres
-    volumes:
-      - .:/app:z
-    env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
     ports: []
     command: /start-celeryworker
+    healthcheck: {}
 
   celerybeat:
     <<: *celery
     image: democrasite_local_celerybeat
     container_name: democrasite-local-celerybeat
-    depends_on:
-      - redis
-      - postgres
-    ports: []
     command: /start-celerybeat
 
   flower:

docs/CONTRIBUTING.rst

@@ -0,0 +1 @@
+../CONTRIBUTING.rst

docs/README.rst

@@ -0,0 +1 @@
+../README.rst