Fix env substitute issue in websocket docker setup (#3296)

* fix websocket connection issue in docker #3195 * fix websocket connection issue for local env with removing from the prod nginx conf template #319 * fix env substitution issue of proxy_set_header #3196 * review fixes --------- Co-authored-by: Manish Gupta <manish@mgupta.me>
makeplane · Jan 22, 2024 · 38580c3 · 38580c3
1 parent 7ff91fd
commit 38580c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -44,9 +44,6 @@ services:
     env_file:
       - .env
     environment:
-      POSTGRES_USER: ${PGUSER}
-      POSTGRES_DB: ${PGDATABASE}
-      POSTGRES_PASSWORD: ${PGPASSWORD}
       PGDATA: /var/lib/postgresql/data
 
   web:

diff --git a/nginx/env.sh b/nginx/env.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
 
+export dollar="$"
+export http_upgrade="http_upgrade"
 envsubst < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
 exec nginx -g 'daemon off;'
diff --git a/nginx/nginx.conf.dev b/nginx/nginx.conf.dev
@@ -19,7 +19,7 @@ http {
         location / {
             proxy_pass http://web:3000/;
             proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
             proxy_set_header Connection "upgrade";
         }