From 640d1de8ac12ed106b796d209f02179e36e8e82b Mon Sep 17 00:00:00 2001
From: Burhan Khalid <burhan.khalid@gmail.com>
Date: Thu, 7 Jan 2016 08:59:30 +0300
Subject: [PATCH 1/4] Update Dockerfile

Typo
---
 {{cookiecutter.repo_name}}/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile
index 0cb397cd..79d08cf7 100644
--- a/{{cookiecutter.repo_name}}/Dockerfile
+++ b/{{cookiecutter.repo_name}}/Dockerfile
@@ -17,7 +17,7 @@ RUN chown -R django /app
 COPY ./compose/django/gunicorn.sh /gunicorn.sh
 COPY ./compose/django/entrypoint.sh /entrypoint.sh
 RUN sed -i 's/\r//' /entrypoint.sh
-RUN set -i 's/\r//' /guincorn.sh
+RUN sed -i 's/\r//' /guincorn.sh
 RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh
 RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh
 

From 30e0f2ace13637c1cb8c9ac6c96c1fb24ad06330 Mon Sep 17 00:00:00 2001
From: Jannis Gebauer <jayfk@users.noreply.github.com>
Date: Fri, 8 Jan 2016 10:15:37 +0100
Subject: [PATCH 2/4] fixed typo

---
 {{cookiecutter.repo_name}}/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile
index 79d08cf7..f2f662d5 100644
--- a/{{cookiecutter.repo_name}}/Dockerfile
+++ b/{{cookiecutter.repo_name}}/Dockerfile
@@ -17,7 +17,7 @@ RUN chown -R django /app
 COPY ./compose/django/gunicorn.sh /gunicorn.sh
 COPY ./compose/django/entrypoint.sh /entrypoint.sh
 RUN sed -i 's/\r//' /entrypoint.sh
-RUN sed -i 's/\r//' /guincorn.sh
+RUN sed -i 's/\r//' /gunicorn.sh
 RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh
 RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh
 

From f8a610502a7b33caaee04dfdcd5da942a309d996 Mon Sep 17 00:00:00 2001
From: Jay <ja.geb@me.com>
Date: Fri, 8 Jan 2016 11:16:14 +0100
Subject: [PATCH 3/4] fixed redis url on docker

---
 CHANGELOG.md                                             | 4 ++++
 {{cookiecutter.repo_name}}/compose/django/entrypoint.sh  | 6 +++---
 {{cookiecutter.repo_name}}/config/settings/production.py | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7dec781..d6473f8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-1-8]
+### Changed
+- Fixed redis url on docker (@jayfk)
+
 ## [2015-1-6]
 ### Added
 - You can now enable or disable user registration using the ACCOUNT_ALLOW_REGISTRATION setting. (@ddiazpinto)
diff --git a/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh b/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
index ffae9009..d7a34f03 100644
--- a/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
+++ b/{{cookiecutter.repo_name}}/compose/django/entrypoint.sh
@@ -4,7 +4,7 @@ set -e
 # Since docker-compose relies heavily on environment variables itself for configuration, we'd have to define multiple
 # environment variables just to support cookiecutter out of the box. That makes no sense, so this little entrypoint
 # does all this for us.
-export REDIS_URL=redis://redis:6379/0
+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
@@ -13,6 +13,6 @@ fi
 
 export DATABASE_URL=postgres://$POSTGRES_ENV_POSTGRES_USER:$POSTGRES_ENV_POSTGRES_PASSWORD@postgres:5432/$POSTGRES_ENV_POSTGRES_USER
 {% if cookiecutter.use_celery == 'y' %}
-export CELERY_BROKER_URL=$REDIS_URL
+export CELERY_BROKER_URL=$REDIS_URL/0
 {% endif %}
-exec "$@"
\ No newline at end of file
+exec "$@"
diff --git a/{{cookiecutter.repo_name}}/config/settings/production.py b/{{cookiecutter.repo_name}}/config/settings/production.py
index be16818a..09b7ba37 100644
--- a/{{cookiecutter.repo_name}}/config/settings/production.py
+++ b/{{cookiecutter.repo_name}}/config/settings/production.py
@@ -170,7 +170,7 @@ DATABASES['default'] = env.db("DATABASE_URL")
 CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": "{0}/{1}".format(env.cache_url('REDIS_URL', default="redis://127.0.0.1:6379"), 0),
+        "LOCATION": "{0}/{1}".format(env('REDIS_URL', default="redis://127.0.0.1:6379"), 0),
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
             "IGNORE_EXCEPTIONS": True,  # mimics memcache behavior.

From 424d176b0dac9b0dc8c1c071c1c8241430e5f405 Mon Sep 17 00:00:00 2001
From: Jannis Gebauer <jayfk@users.noreply.github.com>
Date: Fri, 8 Jan 2016 11:30:27 +0100
Subject: [PATCH 4/4] windows fix for docker

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6473f8c..506b7cb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [2015-1-8]
 ### Changed
 - Fixed redis url on docker (@jayfk)
+- Fixed docker on windows (@burhan)
 
 ## [2015-1-6]
 ### Added