Fixed compose environments

Author: AjayParthibha

client/src/StaticTab.js

@@ -3,7 +3,7 @@ import Select from "react-select";
 import UploadCsv from "./UploadCsv";
 
 const API_BASE = (process.env.REACT_APP_API_URL || "").replace(/\/$/, "");
-const EV_URL = process.env.REACT_APP_EV_URL || "http://localhost:8000/ev/";
+const EV_URL = `http://${process.env.HOST}:8000/ev/`;
 
 export default function StaticTab() {
   const [csvList, setCsvList] = useState([]);

client/src/UploadBag.js

@@ -21,7 +21,7 @@ function UploadBag({ onUploadComplete, loading }) {
         console.log("Uploading file:", file);
       }
 
-      const response = await fetch("http://localhost:5000/upload-folder", {
+      const response = await fetch(`http://${process.env.HOST}:5000/upload-folder`, {
         method: "POST",
         body: formData,
       });

client/src/UploadCsv.js

@@ -19,7 +19,7 @@ function UploadCSV({ onUploadComplete, loading }) {
 
       console.log("Uploading CSV file:", file.name);
 
-      const response = await fetch("http://localhost:5000/upload-csv", {
+      const response = await fetch(`http://${process.env.HOST}:5000/upload-csv`, {
         method: "POST",
         body: formData,
       });

docker-compose.prod.yml

@@ -22,7 +22,7 @@ services:
     image: ghcr.io/cornellev/viz-client:latest
     networks: [internal]
     environment:
-      REACT_APP_EV_URL: ${REACT_APP_EV_URL}
+      HOST: ${HOST}
 
   server:
     image: ghcr.io/cornellev/viz-server:latest
@@ -41,8 +41,7 @@ services:
 
   pyworker:
     build: ./pyworker
-    ports:
-      - "8000:8000"
+    networks: [internal]
     image: ghcr.io/cornellev/viz-worker:latest
     environment:
       DB_HOST: db

docker-compose.yml

@@ -11,6 +11,7 @@ services:
       - CHOKIDAR_USEPOLLING=true
       - WATCHPACK_POLLING=true
       - WDS_SOCKET_PORT=3000
+      - HOST=${HOST}
     volumes:
       - ./client:/app
       - /app/node_modules

nginx/default.conf

@@ -3,6 +3,10 @@ map $http_upgrade $connection_upgrade {
   ''      close;
 }
 
+upstream pyworker {
+    server pyworker:8000;
+}
+
 server {
   listen 80;
   server_name visualization_toolbox;  # set to your domain in prod
@@ -67,10 +71,16 @@ server {
     proxy_set_header Upgrade    $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
     proxy_set_header Host       $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
   }
   location = /ev {
     proxy_pass http://pyworker:8000/ev;
     proxy_http_version 1.1;
     proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
   }
 }