From 8a70728641383af9b3004fd4839706c8668ff3fa Mon Sep 17 00:00:00 2001 From: Titus Soporan Date: Sat, 3 Aug 2019 11:43:23 -0400 Subject: [PATCH 1/2] Update env vars for compose + example Signed-off-by: Titus Soporan --- docker-compose.yaml | 23 +++++++++++++---------- env.example | 27 +++++++++++++++------------ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index dee9877..30221ce 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,9 +5,9 @@ services: ports: - "5432:5432" environment: - - POSTGRES_DB=fittrak - - POSTGRES_USER=fittrak - - POSTGRES_PASSWORD=fittrak + - POSTGRES_DB=${DB_NAME} + - POSTGRES_USER=${DB_USER} + - POSTGRES_PASSWORD=${DB_PASSWORD} volumes: - ./data/fittrak-db:/var/lib/postgresql/data @@ -22,15 +22,18 @@ services: - "./fittrak:/usr/src/app/fittrak" - "./ipython-data:/root/.ipython/profile_default" environment: - - DJANGO_SECRET_KEY=foo - - DJANGO_HASHIDS_SALT=bar + - DJANGO_SECRET_KEY=${DJANGO_SECRET_KEY} + - DJANGO_HASHIDS_SALT=${DJANGO_HASHIDS_SALT} - DJANGO_DEBUG=False - DB_ENGINE=django.db.backends.postgresql - - DB_NAME=fittrak - - DB_USER=fittrak - - DB_PASSWORD=fittrak - - DB_PORT=5432 - - DB_HOST=db + - DB_NAME=${DB_NAME} + - DB_USER=${DB_USER} + - DB_PASSWORD=${DB_PASSWORD} + - DB_PORT=${DB_PORT} + - DB_HOST=${DB_HOST} + - SENTRY_DSN=${SENTRY_DSN} + - SENTRY_ENV=${SENTRY_ENV} + - SENTRY_RELEASE=${SENTRY_RELEASE} depends_on: - db diff --git a/env.example b/env.example index 77ea871..6cf4013 100644 --- a/env.example +++ b/env.example @@ -1,12 +1,15 @@ -DJANGO_SECRET_KEY = "" -DJANGO_HASHIDS_SALT = "" -EMAIL_HOST = 'smtp.mailgun.org' -EMAIL_HOST_USER = '' -EMAIL_HOST_PASSWORD = '' -EMAIL_PORT = 587 -DB_ENGINE = "django.db.backends.postgresql" -DB_NAME = fittrak -DB_USER = fittrak -DB_PASSWORD = -DB_HOST = 127.0.0.1 -DB_PORT = 5432 +DJANGO_SECRET_KEY="" +DJANGO_HASHIDS_SALT="" +EMAIL_HOST= 'smtp.mailgun.org' +EMAIL_HOST_USER= +EMAIL_HOST_PASSWORD= +EMAIL_PORT=587 +DB_ENGINE="django.db.backends.postgresql" +DB_NAME= +DB_USER= +DB_PASSWORD= +DB_HOST= +DB_PORT= +SENTRY_DSN= +SENTRY_ENV= +SENTRY_RELEASE= From eae4fc74b65106c4e16af10878bf1111c4aeb34f Mon Sep 17 00:00:00 2001 From: Titus Soporan Date: Sat, 3 Aug 2019 11:43:45 -0400 Subject: [PATCH 2/2] Add env and release tracking to Sentry Signed-off-by: Titus Soporan --- fittrak/fittrak/settings.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fittrak/fittrak/settings.py b/fittrak/fittrak/settings.py index 76b7840..ec3074e 100644 --- a/fittrak/fittrak/settings.py +++ b/fittrak/fittrak/settings.py @@ -8,7 +8,12 @@ import sentry_sdk from sentry_sdk.integrations.django import DjangoIntegration -sentry_sdk.init(dsn=os.getenv("SENTRY_DSN"), integrations=[DjangoIntegration()]) +sentry_sdk.init( + dsn=os.getenv("SENTRY_DSN"), + integrations=[DjangoIntegration()], + environment=os.getenv("SENTRY_ENV"), + release=os.getenv("SENTRY_RELEASE"), +) # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))