1
Fork 0

Correctly set base url

This commit is contained in:
Jake Howard 2018-07-24 21:49:39 +01:00
parent cdc4bcd93a
commit 78f1c1ea42
Signed by: jake
GPG Key ID: 57AFB45680EDD477
2 changed files with 2 additions and 20 deletions

View File

@ -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

View File

@ -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/