Merge pull request #266 from DefangLabs/linda-django

django changes

Author: jordanstephens

.github/workflows/deploy.yaml

@@ -19,8 +19,7 @@ jobs:
     - name: Deploy
       uses: DefangLabs/[email protected]
       with:
-        config-env-vars: SECRET_KEY POSTGRES_PASSWORD POSTGRES_PARAMS
+        config-env-vars: SECRET_KEY POSTGRES_PASSWORD
       env:
         SECRET_KEY: ${{ secrets.SECRET_KEY }}
-        POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-        POSTGRES_PARAMS: ${{ secrets.POSTGRES_PARAMS }}
+        POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}

compose.dev.yaml

@@ -7,9 +7,9 @@ services:
       - ./app:/app
     healthcheck: {}
     environment:
-      REDIS_URL: redis://redis-service:6379
-      POSTGRES_URL: postgres://djangouser:djangopassword@postgres-service:5432/djangodatabase
-      DEBUG: "True"
+      - REDIS_URL=redis://redis-service:6379
+      - POSTGRES_URL=postgres://djangouser:djangopassword@postgres-service:5432/djangodatabase
+      - DEBUG="True"
     depends_on:
       - redis-service
       - postgres-service
@@ -25,9 +25,9 @@ services:
       file: compose.yaml
       service: postgres-service
     environment:
-      POSTGRES_DB: djangodatabase
-      POSTGRES_USER: djangouser
-      POSTGRES_PASSWORD: djangopassword
+      - POSTGRES_DB=djangodatabase
+      - POSTGRES_USER=djangouser
+      - POSTGRES_PASSWORD=djangopassword
     volumes:
       - postgres_data:/var/lib/postgresql/data
 

compose.yaml

@@ -10,10 +10,10 @@ services:
         published: 8000
         mode: ingress
     environment:
-      REDIS_URL: redis://redis-service:6379
-      # if using BYOC set POSTGRES_PARAMS to ?sslmode=require in playground, set to ?
-      POSTGRES_URL: "postgres://djangouser:${POSTGRES_PASSWORD}@postgres-service:5432/djangodatabase${POSTGRES_PARAMS}"
-      SECRET_KEY:
+      - REDIS_URL=redis://redis-service:6379
+      # if using BYOC add sslmode=require to the POSTGRES_URL query params
+      - POSTGRES_URL=postgres://djangouser:${POSTGRES_PASSWORD}@postgres-service:5432/djangodatabase?
+      - SECRET_KEY
     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
@@ -35,6 +35,6 @@ services:
       - mode: host
         target: 5432
     environment:
-      POSTGRES_PASSWORD:
-      POSTGRES_DB: djangodatabase
-      POSTGRES_USER: djangouser
+      - POSTGRES_PASSWORD
+      - POSTGRES_DB=djangodatabase
+      - POSTGRES_USER=djangouser