Added docker setup

DataScraper/.dockerignore

@@ -0,0 +1,2 @@
+__pycache__
+venv

DataScraper/Dockerfile

@@ -0,0 +1,22 @@
+FROM python:3.7-slim
+
+LABEL Author="Jakub Perżyło"
+LABEL version="1.0.0"
+
+ENV FLASK_APP "scraper"
+
+RUN mkdir /app
+WORKDIR /app
+
+COPY . .
+
+RUN pip install --upgrade pip && \
+    pip install -r requirements.txt
+
+ADD . /app
+
+
+EXPOSE 5000
+
+CMD flask run --host=0.0.0.0
+

DataScraper/requirements.txt

@@ -7,7 +7,6 @@ idna==2.9
 itsdangerous==1.1.0
 Jinja2==2.11.1
 MarkupSafe==1.1.1
-pkg-resources==0.0.0
 requests==2.23.0
 sgqlc==10.1
 urllib3==1.25.8

backend/coronavirus-visualizer-api/.dockerignore

@@ -0,0 +1,2 @@
+dist
+node_modules

backend/coronavirus-visualizer-api/Dockerfile

@@ -0,0 +1,12 @@
+FROM node:10.15.2-alpine as builder
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+COPY package* ./
+COPY tsconfig.json ./
+COPY src/ src/
+RUN npm install
+RUN npm run build:prod
+
+CMD [ "npm", "run", "start:prod" ]
+
+EXPOSE 4000

backend/coronavirus-visualizer-api/package.json

@@ -6,6 +6,8 @@
   "scripts": {
     "start:dev": "nodemon dist/index.js",
     "build:dev": "tsc --watch --preserveWatchOutput",
+    "build:prod": "tsc",
+    "start:prod": "node dist/index.js",
     "dev": "concurrently \"npm:build:dev\" \"npm:start:dev\""
   },
   "keywords": [],

backend/coronavirus-visualizer-api/src/config/constants.ts

@@ -1 +1,4 @@
-export const PORT = process.env.PORT || 4000;
+export const PORT = process.env.PORT || 4000;
+export const HOST = process.env.HOST || "localhost";
+export const MONGO_DB = process.env.MONGO_DB || "localhost";
+export const VIRUS_DATA_API = process.env.VIRUS_DATA_API || "localhost:5000";

backend/coronavirus-visualizer-api/src/index.ts

@@ -1,6 +1,6 @@
 import express from 'express';
 import logger from 'morgan';
-import { PORT } from './config/constants';
+import { PORT, MONGO_DB, HOST } from './config/constants';
 import indexRouter from "./routes/index";
 import mongoose from 'mongoose';
 import {CronJob} from "cron";
@@ -13,7 +13,7 @@ app.use(logger("dev"));
 
 app.use("/api", indexRouter);
 
-const mongoUri = "mongodb://localhost/corona_visualizer";
+const mongoUri = `mongodb://${MONGO_DB}/corona_visualizer`;
 
 
 mongoose.connect(mongoUri, {
@@ -24,10 +24,10 @@ mongoose.connect(mongoUri, {
     console.log("MongoDB: ", err);
   } else {
     console.log("Connected to MongoDb");
+  refreshTimelinesJob();
   }
 });
 
-refreshTimelinesJob();
 // run cron job every full hour - refreshing timelines
 const job = new CronJob("0 * * * *", () => {
     refreshTimelinesJob();
@@ -36,6 +36,6 @@ const job = new CronJob("0 * * * *", () => {
 job.start();
 
 app.listen(PORT, () => {
-    console.log(`Server is listening on port ${PORT}`);
+    console.log(`Server is listening on port${PORT}`);
 });
 

backend/coronavirus-visualizer-api/src/services/timeline_refresher.ts

@@ -1,5 +1,6 @@
 import fetch from "node-fetch";
 import { VirusTimelineType, VirusTimelineSchema } from "../models/timeline";
+import { VIRUS_DATA_API } from "../config/constants";
 
 
 
@@ -11,7 +12,7 @@ export const refreshTimelinesJob = async () => {
 
     for (let key in countries) {
         for (let api of APIS) {
-            const url = `http://127.0.0.1:5000/api/timelines/${countries[key]}?api=${api}`;
+            const url = `http://${VIRUS_DATA_API}/api/timelines/${countries[key]}?api=${api}`;
             try {
                 const response = await fetch(url);
                 const body = await response.json();
@@ -32,7 +33,7 @@ export const refreshTimelinesJob = async () => {
                 break;
 
             } catch (err) {
-                console.log("error while updating timeline");
+                console.log("error while updating timeline", err);
             }
 
 

docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3'
+services:
+  mongo:
+    image: mongo
+  virus_server:
+    image: virus_server
+    build: ./backend/coronavirus-visualizer-api
+    environment:
+      - MONGO_DB=mongo
+      - VIRUS_DATA_API=virus_data_api:5000
+      - HOST=0.0.0.0
+    ports:
+      - "4000:4000"
+  virus_data_api:
+    image: virus_data_api
+    build: ./DataScraper
+    ports:
+      - "5000:5000"