Skip to content

Commit 1234975

Browse files
committed
Add default fallbacks for PGDATABASE, PGUSER, PGPASSWORD, PGHOST and PGPORT in settings.py
1 parent d814aa0 commit 1234975

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

Dockerfile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
FROM python:3.9-slim
2-
3-
RUN apt-get update \
4-
&& apt-get install -y --no-install-recommends \
5-
build-essential libpq-dev libjpeg-dev zlib1g-dev \
2+
RUN apt-get update && apt-get install -y build-essential libpq-dev zlib1g-dev libjpeg-dev \
63
&& rm -rf /var/lib/apt/lists/*
74

85
WORKDIR /app
9-
106
COPY requirements.txt .
117
RUN pip install --no-cache-dir -r requirements.txt
12-
138
COPY . .
149

15-
RUN python manage.py collectstatic --no-input
16-
17-
CMD ["gunicorn", "casecrimetrace.wsgi:application", "--bind", "0.0.0.0:8000"]
10+
EXPOSE 8000
11+
ENTRYPOINT []
12+
CMD python manage.py collectstatic --no-input \
13+
&& gunicorn casecrimetrace.wsgi:application --bind 0.0.0.0:8000

casecrimetrace/settings.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,20 @@
3030

3131
# SECURITY WARNING: don't run with debug turned on in production!
3232
DEBUG = os.environ.get("DEBUG_VALUE") == "True"
33-
# DEBUG = True
33+
PGDATABASE = env("PGDATABASE", default="postgres")
34+
PGUSER = env("PGUSER", default="postgres")
35+
PGPASSWORD = env("PGPASSWORD", default="")
36+
PGHOST = env("PGHOST", default="localhost")
37+
PGPORT = env("PGPORT", default="5432")
38+
39+
DATABASE_URL = env(
40+
"DATABASE_URL",
41+
default="sqlite:///" + str(BASE_DIR / "db.sqlite3"),
42+
)
3443

3544
ALLOWED_HOSTS = env.list(
3645
"ALLOWED_HOSTS",
37-
default=[
38-
"crimetrace.online",
39-
"www.crimetrace.online",
40-
"8fpbkwdj.up.railway.app",
41-
"*",
42-
],
46+
default=["crimetrace.online", "www.crimetrace.online", "8fpbkwdj.up.railway.app"],
4347
)
4448

4549
CSRF_TRUSTED_ORIGINS = [
@@ -102,9 +106,6 @@
102106

103107
# Database
104108
# https://docs.djangoproject.com/en/3.1/ref/settings/#databases
105-
106-
DATABASE_URL = env("DATABASE_URL", default="sqlite:///" + str(BASE_DIR / "db.sqlite3"))
107-
108109
DATABASES = {
109110
"default": {
110111
"ENGINE": "django.db.backends.postgresql",

0 commit comments

Comments
 (0)