Fixed vis dependancy issues

* Update readme (#45)

* Change vis-data and vis-network versions

* Fix react hot reloading (#47)

* Separate dev and prod dockerfile

* Separate dev and prod nginx configs

* Use new dev and prod nginx images

* Bump version

* Use arrays instead of vis datasets

* Remove vis-dataset

README.md

@@ -16,6 +16,7 @@ Other applications are:
 - [Simulation Run Environment](https://github.com/agent-base-information-flow-simulation/simulation-run-environment) - scalable run environment for Agents Assembly.
 - [Communication Server](https://github.com/agent-based-information-flow-simulation/communication-server) - cluster of servers used for XMPP communication.
 - [Agents Assembly Translator](https://github.com/agent-based-information-flow-simulation/agents-assembly-translator) - translator for Agents Assembly code.
+- [Local Development Environment](https://github.com/agent-based-information-flow-simulation/local-development-environment) - simple environment for running agent-based simulations.
 
 ![aasm_vis](.readme-images/ui_vis_tab_example.png)
 

docker-compose.dev.swarm.yml

@@ -16,7 +16,9 @@ services:
       - ./user-interface/src:/app/src
 
   proxy:
-    build: ./proxy
+    build: 
+      context: ./proxy
+      dockerfile: Dockerfile.dev
     image: 127.0.0.1:5000/li-proxy
     ports:
       - "80:80"

docker-compose.swarm.yml

@@ -14,7 +14,9 @@ services:
       - user-interface-data:/app/node_modules
 
   proxy:
-    build: ./proxy
+    build: 
+      context: ./proxy
+      dockerfile: Dockerfile.prod
     image: "madpeh/li-proxy:${VERSION}"
     ports:
       - "80:80"

proxy/Dockerfile.dev

@@ -0,0 +1,4 @@
+FROM nginx:1.23.3-alpine-slim
+RUN rm /usr/share/nginx/html/*
+COPY ./nginx.conf.dev /etc/nginx/nginx.conf
+CMD [ "nginx", "-g", "daemon off;" ]

proxy/Dockerfile.prod

@@ -0,0 +1,4 @@
+FROM nginx:1.23.3-alpine-slim
+RUN rm /usr/share/nginx/html/*
+COPY ./nginx.conf.prod /etc/nginx/nginx.conf
+CMD [ "nginx", "-g", "daemon off;" ]

proxy/nginx.conf.dev

@@ -0,0 +1,43 @@
+events {}
+
+http {
+  gzip on;
+  gzip_types text/plain application/json;
+  gzip_min_length 250;
+
+  proxy_read_timeout 1h;
+  proxy_connect_timeout 1h;
+  proxy_send_timeout 1h;
+
+  server {
+    listen 80;
+    resolver 127.0.0.11 ipv6=off valid=5s;
+
+    location /api {
+      set $sre_entrypoint http://sre_entrypoint:80;
+      rewrite /api/(.*) /$1 break;
+      proxy_pass $sre_entrypoint;
+    }
+
+    location /ws {
+        proxy_pass http://li_user-interface:80;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
+    location / {
+      set $user_interface http://li_user-interface:80;
+      proxy_pass $user_interface;
+    }
+  }
+}
+
+stream {
+  server {
+    listen 7687;
+    resolver 127.0.0.11 ipv6=off valid=5s;
+    set $sre_entrypoint sre_entrypoint:7687;
+    proxy_pass $sre_entrypoint;
+  }
+}