cleaning up for phase III

docker-compose.yml

@@ -2,6 +2,8 @@ version: '3'
 services:
   nginx:
     container_name: nginx
+    depends_on:
+      - app
     restart: always
     build: ./nginx
     image: custom/nginx
@@ -9,7 +11,6 @@ services:
       - 8000:8000
     networks: 
       - network_1
-      # - traefik-net
   app:
     container_name: app
     depends_on:
@@ -20,7 +21,6 @@ services:
     networks:
       - network_1
       - network_2
-      # - labbs_overlay
   mongo:
     container_name: mongo
     build: ./mongo
@@ -30,7 +30,6 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: ruth
     networks:
       - network_2
-      # - labbs_overlay
     ports:
       - 27017:27017
   prometheus:
@@ -40,7 +39,6 @@ services:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
     networks:
       - network_2
-      # - labbs_overlay
     ports:
      - 9090:9090
   grafana:
@@ -52,16 +50,12 @@ services:
       - 3000:3000
 networks:
   network_1:
-    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 192.168.5.0/24
   network_2:
-    driver: bridge
-  # labbs_overlay:
-  #   driver: overlay
-  # traefik-net:
-  #   external:
-  #     name: traefik-net
-  # default:
-  #   ipam:
-  #     driver: default
-  #     config:
-  #       - subnet: 192.168.5.0/24
+    ipam:
+      driver: default
+      config:
+        - subnet: 192.168.6.0/24

node/app.js

@@ -8,6 +8,8 @@ var counter = 0;
 const Prometheus = require('prom-client');
 var fs = require('file-system');
 var marked = require('marked');
+const bodyParser = require('body-parser');
+const jwt = require('jsonwebtoken');
 
 // database connection (with retries)
 const options = {
@@ -107,6 +109,8 @@ app.post('/info/add/:name', function(req, res){
   res.send('color ' + req.params.name + ' added to database');
 });
 
+
+
 connectWithRetry();
 
 app.listen(3001, () => {

node/package.json

@@ -18,6 +18,8 @@
     "mongoose": "^5.3.2",
     "prom-client": "^11.2.0",
     "file-system": "^2.2.2",
-    "marked": "^0.5.2"
+    "marked": "^0.5.2",
+    "body-parser": "^1.18.3",
+    "jsonwebtoken": "^8.4.0"
   }
 }