Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion djangoproject/settings/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,21 @@
}
}

# Trac connection
DATABASES["trac"] = {
"ENGINE": "django.db.backends.postgresql",
"NAME": os.environ.get("TRAC_DATABASE", "code.djangoproject"),
"USER": os.environ.get("TRAC_USER", "code.djangoproject"),
"PASSWORD": os.environ.get("TRAC_PASSWORD", ""),
"HOST": os.environ.get("TRAC_HOST", "db"),
"PORT": os.environ.get("TRAC_PORT", "5432"),
}

SECRET_KEY = os.environ.get("SECRET_KEY")

ALLOWED_HOSTS = [".localhost", "127.0.0.1", "www.127.0.0.1"]

LOCALE_MIDDLEWARE_EXCLUDED_HOSTS = ["docs.djangoproject.localhost"]

# django-hosts settings
PARENT_HOST = "localhost:8000"
PARENT_HOST = "djangoproject.localhost:8000"
8 changes: 8 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ services:
- SQL_PASSWORD=secret
- SQL_HOST=db
- SQL_PORT=5432
- TRAC_DATABASE=code.djangoproject
- TRAC_USER=code.djangoproject
- TRAC_PASSWORD=secret
- TRAC_HOST=db
- TRAC_PORT=5432

depends_on:
db:
condition: service_healthy
Expand All @@ -35,3 +41,5 @@ services:
interval: 1s
timeout: 10s
retries: 10
volumes:
- ./initdb/tracdb.sql:/docker-entrypoint-initdb.d/tracdb.sql

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 changes: 1 addition & 1 deletion docker-entrypoint.dev.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

python -m manage flush --no-input
# PGPASSWORD=djangoproject psql --host db --port 5432 --username=code.djangoproject --dbname=code.djangoproject < tracdb/trac.sql
PGPASSWORD=secret psql --host db --port 5432 --username=code.djangoproject --dbname=code.djangoproject < tracdb/trac.sql
python -m manage migrate
make compile-scss # must come before collectstatic
python -m manage collectstatic --no-input --clear
Expand Down
3 changes: 3 additions & 0 deletions initdb/tracdb.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- Legacy Trac DB
CREATE USER "code.djangoproject" WITH PASSWORD 'secret' CREATEDB;
CREATE DATABASE "code.djangoproject" OWNER "code.djangoproject";
Loading