From 78f1c1ea42b16e1d6ce5c7efb22060ee07957e88 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Tue, 24 Jul 2018 21:49:39 +0100 Subject: [PATCH] Correctly set base url --- docker-compose.yml | 1 + project/settings.py | 21 +-------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c3371a8..0740ac0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: environment: DJANGO_SECRET_KEY: changeme DATABASE_URL: postgres://app_user:changeme@db/app_db + BASE_URL: "http://localhost:8000" build: context: . dockerfile: ./Dockerfile diff --git a/project/settings.py b/project/settings.py index 29e4c1a..a113108 100644 --- a/project/settings.py +++ b/project/settings.py @@ -21,7 +21,7 @@ WAGTAIL_SITE_NAME = "project" # Base URL to use when referring to full URLs within the Wagtail admin backend - # e.g. in notification emails. Don't include '/admin' or a trailing slash -BASE_URL = 'http://example.com' +BASE_URL = os.environ['BASE_URL'] DEBUG = True @@ -128,25 +128,6 @@ DATABASES = { } -# Password validation -# https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - - # Internationalization # https://docs.djangoproject.com/en/2.0/topics/i18n/