From 50b8d4f82e26e5e44a20cca44d3bf19e654f3e04 Mon Sep 17 00:00:00 2001 From: cami Date: Sun, 18 Jul 2021 23:59:04 +0200 Subject: [PATCH] Added backend for the analytics stuff.. --- docker-compose.prod.yml | 13 ++++++++++++- docker-compose.yml | 15 +++++++++++++-- frontend/package.json | 2 +- frontend/src/components/pages/BehaviorNormal.js | 1 + test-prod-containers.yml | 13 ++++++++++++- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 0d9dba1..10c3e2d 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -10,5 +10,16 @@ services: container_name: backend-prod environment: DEBUG: "no" - PORT: 5000 + PORT: 5050 HOST: "0.0.0.0" + behametrics-server: + image: registry.gitlab.com/behametrics/server:latest + container_name: "behametrics-server" + ports: + - 5000:5000 + environment: + - MONGO_URI=mongodb://mongodb:27017/behametrics + mongodb: + image: mongo:4.0.1 + container_name: "behametrics-mongo" + command: mongod --smallfiles diff --git a/docker-compose.yml b/docker-compose.yml index 99ccc16..46dafc3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,8 +22,19 @@ services: volumes: - ./backend/src:/app/ ports: - - 5000:5000 + - 5050:5050 environment: DEBUG: "yes" - PORT: 5000 + PORT: 5050 HOST: "0.0.0.0" + behametrics-server: + image: registry.gitlab.com/behametrics/server:latest + container_name: "behametrics-server" + ports: + - 5000:5000 + environment: + - MONGO_URI=mongodb://mongodb:27017/behametrics + mongodb: + image: mongo:4.0.1 + container_name: "behametrics-mongo" + command: mongod --smallfiles diff --git a/frontend/package.json b/frontend/package.json index 9ff8abf..4a7d640 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -42,5 +42,5 @@ "last 1 safari version" ] }, - "proxy": "http://localhost:5000" + "proxy": "http://localhost:5050" } diff --git a/frontend/src/components/pages/BehaviorNormal.js b/frontend/src/components/pages/BehaviorNormal.js index 44fde4d..81c3580 100644 --- a/frontend/src/components/pages/BehaviorNormal.js +++ b/frontend/src/components/pages/BehaviorNormal.js @@ -21,6 +21,7 @@ export default function BehaviorNormal() { let logger = new Logger({ //inputs: ["cursor", "wheel", "keyboard", "touch"], inputs: ["keyboard"], + apiUrl: "http://localhost:5000", logToConsole: true, }); diff --git a/test-prod-containers.yml b/test-prod-containers.yml index b4708fa..4ce5ecb 100644 --- a/test-prod-containers.yml +++ b/test-prod-containers.yml @@ -14,5 +14,16 @@ services: dockerfile: Dockerfile.prod environment: DEBUG: "no" - PORT: 5000 + PORT: 5050 HOST: "0.0.0.0" + behametrics-server: + image: registry.gitlab.com/behametrics/server:latest + container_name: "behametrics-server" + ports: + - 5000:5000 + environment: + - MONGO_URI=mongodb://mongodb:27017/behametrics + mongodb: + image: mongo:4.0.1 + container_name: "behametrics-mongo" + command: mongod --smallfiles