From 23f02edf25f716d38d91b750fcd995a15d0e06ca Mon Sep 17 00:00:00 2001
From: Krzysztof Szumny <krzysztof.szumny@spistresci.pl>
Date: Sat, 22 Aug 2015 10:57:59 +0200
Subject: [PATCH] use_docker removed

---
 cookiecutter.json                             |  1 -
 hooks/post_gen_project.py                     | 20 +------------------
 {{cookiecutter.repo_name}}/README.rst         |  2 --
 .../config/settings/common.py                 |  4 ----
 4 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index 44f10185a..6653b5287 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -13,7 +13,6 @@
     "use_celery": "n",
     "use_maildump": "n",
     "use_sentry": "n",
-    "use_docker": "n",
     "use_pycharm": "n",
     "windows": "n"
 }
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index e019f5a9e..5b43a08cd 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -12,21 +12,6 @@ def clean(items):
         else:
             os.remove(path)
 
-pycharm = '{{cookiecutter.use_pycharm}}' == 'y'
-docker = '{{cookiecutter.use_docker}}' == 'y'
-
-# ------------------------------------------------------------------------------
-docker_files = [
-    'debug.yml',
-    'dev.yml',
-    'docker-compose.yml',
-    'Dockerfile',
-    'compose/',
-]
-
-if not docker:
-    clean(docker_files)
-# ------------------------------------------------------------------------------
 pycharm_files = [
     '.idea/',
 ]
@@ -50,8 +35,5 @@ pycharm_docker_files = [
     '.idea/Docker__tests___users.xml',
 ]
 
-if not pycharm:
+if '{{cookiecutter.use_pycharm}}' != 'y':
     clean(pycharm_files)
-elif pycharm and not docker:
-    clean(pycharm_docker_files)
-# ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.repo_name}}/README.rst
index 4a65b5f48..79dfb430a 100644
--- a/{{cookiecutter.repo_name}}/README.rst
+++ b/{{cookiecutter.repo_name}}/README.rst
@@ -279,7 +279,6 @@ You can then deploy by running the following commands.
     ssh -t dokku@yourservername.com dokku run {{cookiecutter.repo_name}} python manage.py createsuperuser
 
 When deploying via Dokku make sure you backup your database in some fashion as it is NOT done automatically.
-{% if cookiecutter.use_docker == 'y' %}
 
 Docker
 ^^^^^^
@@ -395,4 +394,3 @@ If you want to scale your application, run::
 
 
 **Don't run the scale command on postgres or celerybeat**
-{% endif %}
diff --git a/{{cookiecutter.repo_name}}/config/settings/common.py b/{{cookiecutter.repo_name}}/config/settings/common.py
index 5eb916a58..41447d12e 100644
--- a/{{cookiecutter.repo_name}}/config/settings/common.py
+++ b/{{cookiecutter.repo_name}}/config/settings/common.py
@@ -99,11 +99,7 @@ MANAGERS = ADMINS
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#databases
 DATABASES = {
     # Raises ImproperlyConfigured exception if DATABASE_URL not in os.environ
-    {% if cookiecutter.use_docker == 'y' %}
-    'default': env.db('DATABASE_URL', default='postgres://postgres@postgres/postgres'),
-    {% else %}
     'default': env.db('DATABASE_URL', default='postgres://{% if cookiecutter.windows == "y" %}localhost{% endif %}/{{cookiecutter.repo_name}}'),
-    {% endif %}
 }
 DATABASES['default']['ATOMIC_REQUESTS'] = True