diff --git a/heroku.yml b/heroku.yml deleted file mode 100644 index 980769e..0000000 --- a/heroku.yml +++ /dev/null @@ -1,5 +0,0 @@ -build: - docker: - web: Dockerfile -run: - web: bash -c "python manage.py makemigrations && python manage.py migrate && python manage.py runserver 0.0.0.0:8000" diff --git a/villafleurie/settings.py b/villafleurie/settings.py index ad97f73..a0c8c93 100644 --- a/villafleurie/settings.py +++ b/villafleurie/settings.py @@ -78,32 +78,32 @@ WSGI_APPLICATION = 'villafleurie.wsgi.application' # } # } -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'postgres', - 'USER': 'postgres', - 'HOST': 'db', - 'PORT': '5432', - 'ATOMIC_REQUESTS': True - } -} +# DATABASES = { +# 'default': { +# 'ENGINE': 'django.db.backends.postgresql', +# 'NAME': 'postgres', +# 'USER': 'postgres', +# 'HOST': 'db', +# 'PORT': '5432', +# 'ATOMIC_REQUESTS': True +# } +# } if os.environ.get('ENV') == 'PRODUCTION': # Heroku - # db_from_env = dj_database_url.config(conn_max_age=500) - # DATABASES['default'].update(db_from_env) + db_from_env = dj_database_url.config(conn_max_age=500) + DATABASES['default'].update(db_from_env) # Docker - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'postgres', - 'USER': 'postgres', - 'HOST': 'db', - 'PORT': '5432', - 'ATOMIC_REQUESTS': True - } - } + # DATABASES = { + # 'default': { + # 'ENGINE': 'django.db.backends.postgresql', + # 'NAME': 'postgres', + # 'USER': 'postgres', + # 'HOST': 'db', + # 'PORT': '5432', + # 'ATOMIC_REQUESTS': True + # } + # } AUTH_PASSWORD_VALIDATORS = [