adding hostname dependency (#122)

Co-authored-by: Abhinav Chobey <[email protected]>
HewlettPackard · Sep 20, 2023 · 3cde65b · 3cde65b
1 parent 5dfc773
commit 3cde65b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 19 deletions.
diff --git a/docker-compose-server.yml b/docker-compose-server.yml
@@ -12,12 +12,12 @@ services:
       dockerfile: ./server/Dockerfile
     restart: always
     environment:
-     MYIP: ${IP}
+     MYIP: ${IP:-127.0.0.1}
+     HOSTNAME: ${hostname:-None}
     ports:
       - "8080:80"
     expose:
       - 8000
-
   ui:
     image: ui:latest
     container_name: ui-server
@@ -27,6 +27,7 @@ services:
     restart: always
     environment:
       REACT_APP_MY_IP: ${IP}
+      REACT_APP_MY_HOSTNAME: ${hostname}
     ports:
       - "3000:3000"
     expose:

diff --git a/docs/cmf_server/cmf-server.md b/docs/cmf_server/cmf-server.md
@@ -57,21 +57,24 @@ There are two ways to start cmf server -
     ....
     ```
   
- 4. Execute following command to start both the containers. `IP` variable is the IP address of the machine on which you are executing the following command.
-    ```
-    IP=200.200.200.200 docker compose -f docker-compose-server.yml up
-    ```
-    > Replace `docker compose` with `docker-compose` for older versions.
-    
-    > Also you can adjust `$IP` in `docker-compose-server.yml` to reflect the server IP and run the `docker compose` command without specifying 
-      IP=200.200.200.200.
-      ```
-      .......
-      environment:
-      REACT_APP_MY_IP: ${IP}
-      ......
-      ```
+4. Execute following command to start both the containers. `IP` variable is the IP address and `hostname` is host name of the machine on which you are executing the following command.
+   You can use either way.
+   ```
+   IP=200.200.200.200 docker compose -f docker-compose-server.yml up
+              OR
+   hostname=host_name docker compose -f docker-compose-server.yml up
+   ```
+   > Replace `docker compose` with `docker-compose` for older versions.
     
+   > Also you can adjust `$IP` in `docker-compose-server.yml` to reflect the server IP and run the `docker compose` command without specifying 
+    IP=200.200.200.200.
+     ```
+     .......
+     environment:
+     REACT_APP_MY_IP: ${IP}
+     ......
+     ```
+   
 5. Stop the containers. 
    ```
    docker compose -f docker-compose-server.yml stop

diff --git a/server/app/main.py b/server/app/main.py
@@ -20,11 +20,15 @@
 templates = Jinja2Templates(directory=str(BASE_PATH/"template"))
 app.mount("/cmf-server/data/static", StaticFiles(directory="/cmf-server/data/static"), name="static")
 server_store_path = "/cmf-server/data/mlmd"
+if os.environ.get("MYIP") != "127.0.0.1":
+    url="http://"+os.environ.get('MYIP')+":3000"
+else:
+    url="http://"+os.environ.get('HOSTNAME')+":3000"
 
 origins = [
     "http://localhost:3000",
     "localhost:3000",
-    "http://"+os.environ.get('MYIP')+":3000"
+    url
 ]
 
 app.add_middleware(

diff --git a/ui/src/config.js b/ui/src/config.js
@@ -1,9 +1,15 @@
 import runtimeEnv from "@mars/heroku-js-runtime-env";
 
+let url="";
 const env = runtimeEnv();
-
+if (process.env.REACT_APP_MY_IP !== "127.0.0.1") {
+    url="http://"+process.env.REACT_APP_MY_IP+":8080";
+}
+else {
+    url="http://"+process.env.REACT_APP_MY_HOSTNAME+":8080";
+}
 const config = {
-  apiBasePath: env.REACT_APP_API_BASE_PATH || "http://"+process.env.REACT_APP_MY_IP+":8080",
+  apiBasePath: env.REACT_APP_API_BASE_PATH || url,
   reactAppMode: process.env.REACT_APP_MODE || "dev",
 };