Fix VRMS Dockerization #551

hackforla · Jun 15, 2021 · cc0d73c · cc0d73c
1 parent 85d5420
commit cc0d73c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 122 deletions.
diff --git a/docker-compose-ci.yaml b/docker-compose-ci.yaml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,29 +31,12 @@ services:
       - client_node_modules:/srv/client/node_modules
     expose:
       - "3000"
-      - "4000"
     ports:
       - "3000:3000"
-    stdin_open: true
-    restart: on-failure
-    networks:
-      - gateway
-
-  client-mvp-04:
-    build:
-      context: ./client-mvp-04
-      dockerfile: Dockerfile.client
-      target: client-mvp-development
-    command: npm run start
-    volumes:
-      - ./client-mvp-04:/srv/client
-      - client-mvp-04_node_modules:/srv/client/node_modules
-    expose:
-      - "3001"
-      - "3002"
-      - "4000"
-    ports:
-      - "3001:3001"
+    environment:
+      BACKEND_HOST: backend
+    depends_on: 
+      - backend
     stdin_open: true
     restart: on-failure
     networks:
@@ -65,13 +48,11 @@ services:
       dockerfile: Dockerfile.nginx
       context: ./nginx
     ports:
-      - "8000:80"
-      - "8001:81"
+      - "80:80"
     networks:
       - gateway
     depends_on:
       - client
-      - client-mvp-04
       - backend
 
   mailhog:
@@ -90,5 +71,4 @@ networks:
 
 volumes:
   client_node_modules:
-  client-mvp-04_node_modules:
   backend_node_modules:
diff --git a/nginx/default.conf b/nginx/default.conf
@@ -2,10 +2,6 @@ upstream client {
     server client:3000;
 }
 
-upstream client-mvp-04 {
-    server client-mvp-04:3001;
-}
-
 upstream backend {
     server backend:4000;
 }
@@ -29,25 +25,3 @@ server {
         proxy_set_header X-Forwarded-Host $server_name;
     }
 }
-
-
-server {
-    listen 81;
-
-    location /api {
-        proxy_pass http://backend;
-    }
-
-    location / {
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_redirect off;
-        proxy_set_header Host $http_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-Host $server_name;
-
-        proxy_pass http://client-mvp-04;
-    }
-}