From 45bbd27f39f36f6ebf84e6b4de87a8e3b695158f Mon Sep 17 00:00:00 2001 From: Aaron Eikenberry Date: Wed, 2 Mar 2016 22:16:25 -0600 Subject: [PATCH 1/5] updates docker-compose format to version 2 #483 --- {{cookiecutter.repo_name}}/dev.yml | 37 ++++---- {{cookiecutter.repo_name}}/docker-compose.yml | 92 +++++++++++-------- 2 files changed, 74 insertions(+), 55 deletions(-) diff --git a/{{cookiecutter.repo_name}}/dev.yml b/{{cookiecutter.repo_name}}/dev.yml index d018f7cd..29b2a9ff 100644 --- a/{{cookiecutter.repo_name}}/dev.yml +++ b/{{cookiecutter.repo_name}}/dev.yml @@ -1,17 +1,22 @@ -postgres: - image: postgres:9.5 - volumes: - # 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 +version: '2' +services: + postgres: + image: postgres:9.5 + volumes: + # 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: - dockerfile: Dockerfile-dev - build: . - command: python /app/manage.py runserver_plus 0.0.0.0:8000 - volumes: - - .:/app - ports: - - "8000:8000" - links: - - postgres + django: + build: + context: . + dockerfile: Dockerfile-dev + command: python /app/manage.py runserver_plus 0.0.0.0:8000 + depends_on: + - postgres + volumes: + - .:/app + ports: + - "8000:8000" + links: + - postgres diff --git a/{{cookiecutter.repo_name}}/docker-compose.yml b/{{cookiecutter.repo_name}}/docker-compose.yml index dc681037..13b65e66 100644 --- a/{{cookiecutter.repo_name}}/docker-compose.yml +++ b/{{cookiecutter.repo_name}}/docker-compose.yml @@ -1,43 +1,57 @@ -postgres: - image: postgres:9.5 - volumes: - - /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data - env_file: .env +version: '2' +services: + postgres: + image: postgres:9.5 + volumes: + - /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data + env_file: .env -django: - build: . - user: django - links: - - postgres - - redis - command: /gunicorn.sh - env_file: .env + django: + build: + context: . + user: django + links: + - postgres + - redis + command: /gunicorn.sh + env_file: .env + depends_on: + - postgres + - redis -nginx: - build: ./compose/nginx - links: - - django - ports: - - "0.0.0.0:80:80" + nginx: + build: ./compose/nginx + links: + - django + ports: + - "0.0.0.0:80:80" -redis: - image: redis:3.0 -{% if cookiecutter.use_celery == 'y' %} -celeryworker: - build: . - user: django - env_file: .env - links: - - postgres - - redis - command: celery -A {{cookiecutter.repo_name}}.taskapp worker -l INFO + redis: + image: redis:3.0 + {% if cookiecutter.use_celery == 'y' %} + celeryworker: + 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: . - user: django - env_file: .env - links: - - postgres - - redis - command: celery -A {{cookiecutter.repo_name}}.taskapp beat -l INFO -{% endif %} + celerybeat: + 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 %} From 76e23d2cf5c2227cd6491e84b6f889bfebf90526 Mon Sep 17 00:00:00 2001 From: Aaron Eikenberry Date: Wed, 2 Mar 2016 22:43:17 -0600 Subject: [PATCH 2/5] customize docker-compose version on travis-ci --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 701bc097..874baf24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,21 @@ services: - docker language: python + python: 3.5 + env: + DOCKER_COMPOSE_VERSION: 1.6.0 - TOX_ENV=py27 - TOX_ENV=py34 - TOX_ENV=py35 +before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/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 From c084e6e90529193a1f25b449d4fc603aa97f3dc0 Mon Sep 17 00:00:00 2001 From: Aaron Eikenberry Date: Wed, 2 Mar 2016 22:46:49 -0600 Subject: [PATCH 3/5] fixes typo in travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 874baf24..d80918d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ language: python python: 3.5 env: - DOCKER_COMPOSE_VERSION: 1.6.0 + - DOCKER_COMPOSE_VERSION: 1.6.0 - TOX_ENV=py27 - TOX_ENV=py34 - TOX_ENV=py35 From 5659cf302c990cd4e65f15c19b0595589a1ed919 Mon Sep 17 00:00:00 2001 From: Aaron Eikenberry Date: Wed, 2 Mar 2016 22:52:00 -0600 Subject: [PATCH 4/5] Trying with hard-coded version :( --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d80918d6..a11a8167 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,13 @@ language: python python: 3.5 env: - - DOCKER_COMPOSE_VERSION: 1.6.0 - TOX_ENV=py27 - TOX_ENV=py34 - TOX_ENV=py35 before_install: - sudo rm /usr/local/bin/docker-compose - - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > 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 From 8f5af542c584e9ea1f1287b0b6fd98b56fc25b46 Mon Sep 17 00:00:00 2001 From: Aaron Eikenberry Date: Thu, 3 Mar 2016 09:20:20 -0600 Subject: [PATCH 5/5] update docker-engine on travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a11a8167..b548b923 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ env: - 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