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,17 +1,22 @@
postgres: version: '2'
image: postgres:9.5 services:
volumes: postgres:
# If you are using boot2docker, postgres data has to live in the VM for now until #581 is fixed image: postgres:9.5
# for more info see here: https://github.com/boot2docker/boot2docker/issues/581 volumes:
- /data/dev/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data # If you are using boot2docker, postgres data has to live in the VM for now until #581 is fixed
# for more info see here: https://github.com/boot2docker/boot2docker/issues/581
- /data/dev/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data
django: django:
dockerfile: Dockerfile-dev build:
build: . context: .
command: python /app/manage.py runserver_plus 0.0.0.0:8000 dockerfile: Dockerfile-dev
volumes: command: python /app/manage.py runserver_plus 0.0.0.0:8000
- .:/app depends_on:
ports: - postgres
- "8000:8000" volumes:
links: - .:/app
- postgres ports:
- "8000:8000"
links:
- postgres

View File

@ -1,43 +1,57 @@
postgres: version: '2'
image: postgres:9.5 services:
volumes: postgres:
- /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data image: postgres:9.5
env_file: .env volumes:
- /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data
env_file: .env
django: django:
build: . build:
user: django context: .
links: user: django
- postgres links:
- redis - postgres
command: /gunicorn.sh - redis
env_file: .env command: /gunicorn.sh
env_file: .env
depends_on:
- postgres
- redis
nginx: nginx:
build: ./compose/nginx build: ./compose/nginx
links: links:
- django - django
ports: ports:
- "0.0.0.0:80:80" - "0.0.0.0:80:80"
redis: redis:
image: redis:3.0 image: redis:3.0
{% if cookiecutter.use_celery == 'y' %} {% if cookiecutter.use_celery == 'y' %}
celeryworker: celeryworker:
build: . build:
user: django context: .
env_file: .env user: django
links: env_file: .env
- postgres links:
- redis - postgres
command: celery -A {{cookiecutter.repo_name}}.taskapp worker -l INFO - redis
command: celery -A {{cookiecutter.repo_name}}.taskapp worker -l INFO
depends_on:
- postgres
- redis
celerybeat: celerybeat:
build: . build:
user: django context: .
env_file: .env user: django
links: env_file: .env
- postgres links:
- redis - postgres
command: celery -A {{cookiecutter.repo_name}}.taskapp beat -l INFO - redis
{% endif %} command: celery -A {{cookiecutter.repo_name}}.taskapp beat -l INFO
depends_on:
- postgres
- redis
{% endif %}