more testing with postgres

Author: raphaeltm

samples/django-channels-redis/app/Dockerfile

@@ -31,4 +31,4 @@ RUN adduser --disabled-password --gecos '' django
 USER django
 
 # Start server
-CMD ["sh", "-c", "python manage.py migrate && gunicorn django_defang.wsgi:application --bind 0.0.0.0:8000"]
+CMD ["sh", "-c", "python manage.py migrate && daphne -b 0.0.0.0 -p 8000 django_defang.asgi:application"]

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

@@ -15,6 +15,19 @@
 import dj_database_url
 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
 
@@ -82,10 +95,11 @@
 # Database
 # https://docs.djangoproject.com/en/5.1/ref/settings/#databases
 
+
 DATABASES = {
     # default is a postrgres database load from environment variable POSTGRES_URL
     "default": dj_database_url.config(
-        default=os.environ.get('POSTGRES_URL')
+        default=fixed_postgres_url
     )
 }
 
@@ -160,4 +174,4 @@
             "hosts": [(redis_host, redis_port)],
         },
     },
-}
+}

samples/django-channels-redis/compose.yaml

@@ -13,7 +13,8 @@ services:
         mode: ingress
     environment:
       REDIS_URL: redis://redis_service:6379
-      POSTGRES_URL: postgres://postgres:password@postgres_service:5432
+      POSTGRES_URL: postgres://postgres:password@postgres_service:5432/postgres
+      POSTGRES_PASSWORD: testtest
     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
@@ -31,4 +32,6 @@ services:
     x-defang-postgres: true
     ports:
       - mode: host
-        target: 5432
+        target: 5432
+    environment:
+      POSTGRES_PASSWORD: testtest