updates docker-compose format to version 2 #483

This commit is contained in:
Aaron Eikenberry 2016-03-02 22:16:25 -06:00
parent 1d731ae48a
commit 45bbd27f39
2 changed files with 74 additions and 55 deletions

View File

@ -1,3 +1,5 @@
version: '2'
services:
postgres: postgres:
image: postgres:9.5 image: postgres:9.5
volumes: volumes:
@ -6,9 +8,12 @@ postgres:
- /data/dev/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data - /data/dev/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data
django: django:
build:
context: .
dockerfile: Dockerfile-dev dockerfile: Dockerfile-dev
build: .
command: python /app/manage.py runserver_plus 0.0.0.0:8000 command: python /app/manage.py runserver_plus 0.0.0.0:8000
depends_on:
- postgres
volumes: volumes:
- .:/app - .:/app
ports: ports:

View File

@ -1,3 +1,5 @@
version: '2'
services:
postgres: postgres:
image: postgres:9.5 image: postgres:9.5
volumes: volumes:
@ -5,13 +7,17 @@ postgres:
env_file: .env env_file: .env
django: django:
build: . build:
context: .
user: django user: django
links: links:
- postgres - postgres
- redis - redis
command: /gunicorn.sh command: /gunicorn.sh
env_file: .env env_file: .env
depends_on:
- postgres
- redis
nginx: nginx:
build: ./compose/nginx build: ./compose/nginx
@ -24,20 +30,28 @@ redis:
image: redis:3.0 image: redis:3.0
{% if cookiecutter.use_celery == 'y' %} {% if cookiecutter.use_celery == 'y' %}
celeryworker: celeryworker:
build: . build:
context: .
user: django user: django
env_file: .env env_file: .env
links: links:
- postgres - postgres
- redis - redis
command: celery -A {{cookiecutter.repo_name}}.taskapp worker -l INFO command: celery -A {{cookiecutter.repo_name}}.taskapp worker -l INFO
depends_on:
- postgres
- redis
celerybeat: celerybeat:
build: . build:
context: .
user: django user: django
env_file: .env env_file: .env
links: links:
- postgres - postgres
- redis - redis
command: celery -A {{cookiecutter.repo_name}}.taskapp beat -l INFO command: celery -A {{cookiecutter.repo_name}}.taskapp beat -l INFO
depends_on:
- postgres
- redis
{% endif %} {% endif %}