1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00

Fix docker deployment

This commit is contained in:
Markus Grigull 2017-07-21 14:15:09 +02:00
parent 6a5a2c735f
commit 355e524348
3 changed files with 9 additions and 10 deletions

View file

@ -10,10 +10,8 @@ networks:
services:
# The VILLASweb frontend
frontend:
build:
build:
context: .
environment:
- REACT_APP_HTTP_PROXY
ports:
- "80:80"
- "443:443"
@ -26,8 +24,6 @@ services:
build: backend
environment:
- NODE_ENV=production
ports:
- "4000:4000"
restart: always
networks:
villas:
@ -65,4 +61,4 @@ services:
volumes:
- "./etc/node/:/etc/villas/node/"
networks:
villas:
villas:

View file

@ -13,8 +13,12 @@ server {
proxy_pass http://backend:4000/;
}
location /ws/ {
location /ws/api/ {
proxy_pass http://node/api/;
}
location /ws {
proxy_pass http://node/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;

View file

@ -22,8 +22,7 @@
import RestAPI from '../api/rest-api';
import AppDispatcher from '../app-dispatcher';
const HOST = process.env.REACT_APP_HTTP_PROXY || "http://localhost:4000";
const API_URL = HOST + '/api/v1';
const API_URL = '/api/v1';
class RestDataManager {
constructor(type, url, keyFilter) {