Merge branch 'docker-compose-v2' of https://github.com/aeikenberry/cookiecutter-django into aeikenberry-docker-compose-v2

This commit is contained in:
Jannis Gebauer 2016-03-08 10:09:06 +01:00
commit 5ea6258d0d
3 changed files with 84 additions and 55 deletions

View File

@ -6,12 +6,22 @@ services:
- docker - docker
language: python language: python
python: 3.5 python: 3.5
env: env:
- TOX_ENV=py27 - TOX_ENV=py27
- TOX_ENV=py34 - TOX_ENV=py34
- TOX_ENV=py35 - TOX_ENV=py35
before_install:
- sudo apt-get update
- sudo apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" docker-engine=1.10.1-0~trusty
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/1.6.0/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
script: script:
- tox -e $TOX_ENV - tox -e $TOX_ENV
- sh tests/test_docker.sh - sh tests/test_docker.sh

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 %}