mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-07-10 16:12:29 +03:00
Merge branch 'docker-compose-v2' of https://github.com/aeikenberry/cookiecutter-django into aeikenberry-docker-compose-v2
This commit is contained in:
commit
5ea6258d0d
10
.travis.yml
10
.travis.yml
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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 %}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user