updated postgres ++

Author: raphaeltm

samples/django-channels-redis/app/django_defang/settings.py

@@ -16,18 +16,6 @@
 import urllib.parse
 
 
-# print redis and postgres urls
-print('@@@@@@@ DEBUG @@@@@@@')
-print(f'redis: {os.getenv("REDIS_URL", None)}')
-print(f'postgres: {os.getenv("POSTGRES_URL", None)}')
-print(f'postgres_password: {os.getenv("POSTGRES_PASSWORD", None)}')
-postgres_url = os.getenv("POSTGRES_URL", None)
-postgres_password = os.getenv("POSTGRES_PASSWORD", None)
-fixed_postgres_url = postgres_url.replace("password", postgres_password) if postgres_url and postgres_password else postgres_url
-print(f'fixed_postgres_url: {fixed_postgres_url}')
-print('@@@@@@@ DEBUG @@@@@@@')
-
-
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -99,7 +87,7 @@
 DATABASES = {
     # default is a postrgres database load from environment variable POSTGRES_URL
     "default": dj_database_url.config(
-        default=fixed_postgres_url
+        default=os.getenv("POSTGRES_URL", None)
     )
 }
 

samples/django-channels-redis/compose.dev.yaml

@@ -13,7 +13,7 @@ services:
     depends_on:
       - redis_service
       - postgres_service
-    command: python manage.py runserver 0.0.0.0:8000
+    command: sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
 
   redis_service:
     extends:

samples/django-channels-redis/compose.yaml

@@ -13,8 +13,7 @@ services:
         mode: ingress
     environment:
       REDIS_URL: redis://redis_service:6379
-      POSTGRES_URL: postgres://postgres:password@postgres_service:5432/postgres
-      POSTGRES_PASSWORD: testtest
+      POSTGRES_URL:
     healthcheck:
       # wget or curl required for healthchecks on services with a published port
       # this gets parsed by Defang and provided to the load balancers as well
@@ -34,4 +33,4 @@ services:
       - mode: host
         target: 5432
     environment:
-      POSTGRES_PASSWORD: testtest
+      POSTGRES_PASSWORD: