From 982b21d61bc2f48bab65a6cb9a936949cbd885fa Mon Sep 17 00:00:00 2001
From: Jannis Gebauer <ja.geb@me.com>
Date: Tue, 8 Mar 2016 10:12:55 +0100
Subject: [PATCH] move from links to depends_on

---
 {{cookiecutter.repo_name}}/compose/django/entrypoint.sh | 8 ++++----
 {{cookiecutter.repo_name}}/docker-compose.yml           | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh b/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
index d7a34f03..e9286baa 100644
--- a/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
+++ b/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
@@ -7,11 +7,11 @@ set -e
 export REDIS_URL=redis://redis:6379
 
 # the official postgres image uses 'postgres' as default user if not set explictly.
-if [ -z "$POSTGRES_ENV_POSTGRES_USER" ]; then
-    export POSTGRES_ENV_POSTGRES_USER=postgres
-fi 
+if [ -z "$POSTGRES_USER" ]; then
+    export POSTGRES_USER=postgres
+fi
 
-export DATABASE_URL=postgres://$POSTGRES_ENV_POSTGRES_USER:$POSTGRES_ENV_POSTGRES_PASSWORD@postgres:5432/$POSTGRES_ENV_POSTGRES_USER
+export DATABASE_URL=postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres:5432/$POSTGRES_USER
 {% if cookiecutter.use_celery == 'y' %}
 export CELERY_BROKER_URL=$REDIS_URL/0
 {% endif %}
diff --git a/{{cookiecutter.repo_name}}/docker-compose.yml b/{{cookiecutter.repo_name}}/docker-compose.yml
index 13b65e66..2a523dd6 100644
--- a/{{cookiecutter.repo_name}}/docker-compose.yml
+++ b/{{cookiecutter.repo_name}}/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     build:
       context: .
     user: django
-    links:
+    depends_on:
       - postgres
       - redis
     command: /gunicorn.sh
@@ -21,7 +21,7 @@ services:
 
   nginx:
     build: ./compose/nginx
-    links:
+    depends_on:
       - django
     ports:
       - "0.0.0.0:80:80"
@@ -34,7 +34,7 @@ services:
       context: .
     user: django
     env_file: .env
-    links:
+    depends_on:
      - postgres
      - redis
     command: celery -A {{cookiecutter.repo_name}}.taskapp worker -l INFO
@@ -47,7 +47,7 @@ services:
       context: .
     user: django
     env_file: .env
-    links:
+    depends_on:
       - postgres
       - redis
     command: celery -A {{cookiecutter.repo_name}}.taskapp beat -l INFO