add deploy setup

Author: copelco

compose/django/Dockerfile

@@ -35,14 +35,15 @@ RUN set -x \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Build Python virtualenv
+ARG DJANGO_REQUIREMENTS
 COPY ./requirements /code/requirements
 RUN set -ex \
     && pip install -U virtualenv \
     && virtualenv /venv \
-    && LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "/venv/bin/pip install -r /code/requirements/production.txt"
+    && LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "/venv/bin/pip install -r /code/requirements/$DJANGO_REQUIREMENTS.txt"
 
 COPY . /code/
 
 RUN /venv/bin/python /code/manage.py collectstatic --noinput
 
-CMD ["/code/compose/django/gunicorn.sh"]
+# CMD ["/code/compose/django/gunicorn.sh"]

docker-compose.deploy.yml

@@ -0,0 +1,34 @@
+version: '3'
+
+services:
+  queue:
+    image: rabbitmq:3.6-management-alpine
+    hostname: queue
+    env_file: .env
+    ports:
+      - "5672"
+      - "15672:15672"  # management plugin
+  worker:
+    env_file: .env
+    environment:
+      - C_FORCE_ROOT=1
+    build:
+      context: .
+      dockerfile: ./compose/django/Dockerfile
+      args:
+        DJANGO_REQUIREMENTS: production
+    command: /venv/bin/celery -A eatsmart worker --loglevel=DEBUG
+    links:
+      - db
+      - queue
+    depends_on:
+      - db
+      - queue
+  app:
+    depends_on:
+      - db
+      - queue
+
+
+# http://vsupalov.com/docker-env-vars/
+# https://github.com/docker/docker-bench-security

docker-compose.override.yml

@@ -2,10 +2,9 @@ version: '3'
 
 services:
   app:
-    environment:
-      - DJANGO_SETTINGS_MODULE=eatsmart.settings.docker
     build:
-      context: .
-      dockerfile: ./compose/django/Dockerfile.override
+      args:
+        DJANGO_REQUIREMENTS: dev
+    command: /code/compose/django/runserver.sh
     volumes:
       - .:/code

docker-compose.yml

@@ -3,28 +3,24 @@ version: '3'
 services:
   db:
     restart: always
-    image: mdillon/postgis:9.3
+    image: mdillon/postgis:9.3-alpine
     volumes:
       - ./pgdata:/var/lib/postgresql/data
     expose:
       - "5432"
-  queue:
-    hostname: queue
-    image: rabbitmq:3.6-alpine
-    environment:
-      - RABBITMQ_DEFAULT_USER=admin
-      - RABBITMQ_DEFAULT_PASS=admin
-    ports:
-      - "5672:5672"  # we forward this port because it's useful for debugging
-      - "15672:15672"  # here, we can access rabbitmq management plugin
   app:
     env_file: .env
     build:
       context: .
       dockerfile: ./compose/django/Dockerfile
+      args:
+        DJANGO_REQUIREMENTS: production
+    command: /code/compose/django/gunicorn.sh
     links:
       - db:db
     ports:
       - "8000:8000"
     depends_on:
       - db
+
+# http://vsupalov.com/docker-env-vars/

docs/docker.rst

@@ -11,7 +11,14 @@ Install `Docker for Mac <https://www.docker.com/docker-mac>`_ .
 Initial Local Development Setup
 -------------------------------
 
-Configure environment to use docker settings file::
+The default development environment will provide you with running PostgreSQL and Django containers:
+
+* PostgreSQL: v9.3 w/ PostGIS v2.3. ``./pgdata`` is mounted from the host environment to persist data.
+* Django: Mounts the current directory into the container and uses ``manage.py runserver``.
+
+The configuration is loaded from ``docker-compose.override.yml`` and ``docker-compose.yml``, respectively.
+
+Configure environment to use the docker settings file::
 
   echo "DJANGO_SETTINGS_MODULE=eatsmart.settings.docker" > .env
 
@@ -38,4 +45,37 @@ The easiest way to get data is to load a db dump::
 
 You'll see a few errors for ``auth_permission``, ``django_content_type``, and ``django_migrations`` tables, but it will still work.
 
+
+Deploy Setup
+------------
+
+This environment will provide you with PostgreSQL, RabbitMQ, Celery, and Django containers. The configuration is loaded from ``docker-compose.dev.yml`` and ``docker-compose.yml``, respectively.
+
+Create environment variables in ``.env``::
+
+  DJANGO_SETTINGS_MODULE=eatsmart.settings.deploy
+  ENVIRONMENT=LOCAL  # LOCAL = testing production env with compose
+  SECRET_KEY=<fill-me-in>
+  DOMAIN=localhost
+  DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
+  RABBITMQ_DEFAULT_USER=admin
+  RABBITMQ_DEFAULT_PASS=admin
+  RABBITMQ_DEFAULT_HOST=queue
+
+Build the containers::
+
+  docker-compose -f docker-compose.yml -f docker-compose.deploy.yml build
+
+Bring up the containers in this order::
+
+  docker-compose -f docker-compose.yml -f docker-compose.deploy.yml up -d db queue
+  docker-compose -f docker-compose.yml -f docker-compose.deploy.yml up -d worker app
+
+Some useful commands::
+
+  docker-compose -f docker-compose.yml -f docker-compose.deploy.yml logs -f
+  docker-compose -f docker-compose.yml -f docker-compose.deploy.yml images
+  docker-compose -f docker-compose.yml -f docker-compose.deploy.yml ps -q | xargs docker stats
+
+
   .. docker-compose run app /venv/bin/python manage.py migrate

eatsmart/settings/deploy.py

@@ -77,7 +77,7 @@
 
 # Uncomment if using celery worker configuration
 CELERY_SEND_TASK_ERROR_EMAILS = True
-BROKER_URL = 'amqp://eatsmart_%(ENVIRONMENT)s:%(BROKER_PASSWORD)s@%(BROKER_HOST)s/eatsmart_%(ENVIRONMENT)s' % os.environ  # noqa
+BROKER_URL = 'amqp://%(RABBITMQ_DEFAULT_USER)s:%(RABBITMQ_DEFAULT_PASS)s@%(RABBITMQ_DEFAULT_HOST)s/' % os.environ  # noqa
 
 # Environment overrides
 # These should be kept to an absolute minimum