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

.travis.yml

@@ -6,12 +6,22 @@ services:
   - docker
 
 language: python
+
 python: 3.5
+
 env:
     - TOX_ENV=py27
     - TOX_ENV=py34
     - 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:
     - tox -e $TOX_ENV
     - sh tests/test_docker.sh

{{cookiecutter.repo_name}}/dev.yml

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

{{cookiecutter.repo_name}}/docker-compose.yml

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