From d4903239ea85d11ad427adec9110a5e2b87e0da6 Mon Sep 17 00:00:00 2001 From: Mattia Date: Thu, 3 Dec 2020 00:15:14 +0100 Subject: [PATCH] put server and db under docker as docker-compose services. Clean up --- .dockerignore | 2 + .gitignore | 3 + Dockerfile | 4 + app.js | 7 +- docker-compose.yml | 26 ++ init-mongo.js | 13 + package.json | 3 +- routes/services.js | 20 - routes/services/echo/echo.js | 11 - .../invisiblepuzzle/invisiblepuzzle.js | 372 ------------------ 10 files changed, 50 insertions(+), 411 deletions(-) create mode 100644 .dockerignore create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 init-mongo.js delete mode 100644 routes/services.js delete mode 100644 routes/services/echo/echo.js delete mode 100644 routes/services/invisiblepuzzle/invisiblepuzzle.js diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..5171c54 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +node_modules +npm-debug.log \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5f9a6c0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +package-lock.json +db_data \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1b4a998 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM node:10 +WORKDIR /usr/src/app +COPY package*.json ./ +RUN npm install \ No newline at end of file diff --git a/app.js b/app.js index 7d10b53..7d87ae8 100644 --- a/app.js +++ b/app.js @@ -3,10 +3,7 @@ var path = require('path'); var logger = require('morgan'); var bodyParser = require('body-parser'); -var storage = require('./routes/storage')('mongodb://icarus:icarus@localhost:27017/icarus'); -var public_storage = require('./routes/storage')('mongodb://public:public@localhost:27017/public'); - -var services = require('./routes/services'); +var storage = require('./routes/storage')('mongodb://icarus:icarus@db/icarus'); var app = express(); @@ -33,8 +30,6 @@ app.use(function(req, res, next) { }); app.use('/icarus/str', storage); -app.use('/icarus/pub', public_storage); -app.use('/icarus/svc', services); // catch 404 and forward to error handler app.use(function(req, res, next) { diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5f3363d --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,26 @@ +version: '3' + +services: + app: + working_dir: /usr/src/app + command: npm start + build: . + depends_on: + - db + volumes: + - node_modules:/usr/src/app/node_modules:cached + - ./:/usr/src/app:cached + ports: + - "8082:3000" #host:container, 3000 is the default port of Express.js + stdin_open: true + tty: true + + db: + image: bitnami/mongodb + volumes: + - ./db_data:/bitnami/mongodb + - ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js + +volumes: + node_modules: + diff --git a/init-mongo.js b/init-mongo.js new file mode 100644 index 0000000..b8593db --- /dev/null +++ b/init-mongo.js @@ -0,0 +1,13 @@ +db = db.getSiblingDB('icarus') //create and set db +db.createUser( + { + user: "icarus", + pwd: "icarus", + roles: [ + { + role: "dbAdmin", + db: "icarus" + } + ] + } +) \ No newline at end of file diff --git a/package.json b/package.json index 47d49ad..86aab91 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "debug": "~2.2.0", "express": "~4.13.1", "mongodb": "~2.0", - "morgan": "~1.6.1", - "sleep": "~3.0.0" + "morgan": "~1.6.1" } } diff --git a/routes/services.js b/routes/services.js deleted file mode 100644 index c925643..0000000 --- a/routes/services.js +++ /dev/null @@ -1,20 +0,0 @@ -var express = require('express'); -var router = express.Router(); - -var ip_service = require('./services/invisiblepuzzle/invisiblepuzzle'); -var echo_service = require('./services/echo/echo'); - -router.use('/ip', ip_service); -router.use('/echo', echo_service); - -router.get('/', function(req, res, next) { - - res.send({ - - "services": ["echo","ip"] - - }); - -}); - -module.exports = router; \ No newline at end of file diff --git a/routes/services/echo/echo.js b/routes/services/echo/echo.js deleted file mode 100644 index 13b8059..0000000 --- a/routes/services/echo/echo.js +++ /dev/null @@ -1,11 +0,0 @@ -var express = require('express'); -var router = express.Router(); - -/* GET root. */ -router.all('/', function(req, res, next) { - - res.send(req.body); - -}); - -module.exports = router; diff --git a/routes/services/invisiblepuzzle/invisiblepuzzle.js b/routes/services/invisiblepuzzle/invisiblepuzzle.js deleted file mode 100644 index c978aea..0000000 --- a/routes/services/invisiblepuzzle/invisiblepuzzle.js +++ /dev/null @@ -1,372 +0,0 @@ -// PROTOCOL SPECIFICATION -// ----------------------- -// /users/count - returns the number of users and how many of them are using VoiceOver -// /users/vib - returns objects representing who are using VoiceOver -// /users/sighted - returns objects representing who are not using VoiceOver - -var express = require('express'); -var router = express.Router(); - -var debug = require('debug')('Icarus:server'); - -var mongoClient = require('mongodb').MongoClient; - -var assert = assert = require('assert'); - -// Connection URL -var mongoUrl = 'mongodb://readOnly:readOnly@localhost:27017/icarus'; - -//Connect to the server and intialise the pool -var icarusDb; -mongoClient.connect(mongoUrl, function(err, db) { - - assert.equal(null, err, err); - debug("Connected to MongoDB database: "+db.databaseName); - - icarusDb = db; - -}); - -/* GET root . */ -router.get('/', function(req, res, next) { - - res.sendStatus(200); - -}); - -router.get('/users/count', function(req, res, next) { - - var collection = icarusDb.collection('resources'); - - var cursor = collection.aggregate( - - // Pipeline - [ - // Stage 1 - { - $match: { - "appdata.appname":"Invisible Puzzle", - "debug":false - } - }, - - // Stage 2 - { - $group: { - "_id": "$appdata.uuid", - "docs": {$sum: 1}, - "voiceover": {$sum : {$cond: [{$eq:["$appdata.voiceover", true]},1,0]}} - } - }, - - // Stage 3 - { - $project: { - - "docs": 1, - "vo_ratio": {$divide:["$voiceover","$docs"]} - - } - }, - - // Stage 4 - { - $group: { - - "_id": 1, - "users": {$sum: 1}, - "vib": {$sum : {$cond: [{$gt:["$vo_ratio", 0]},1,0]}} - - } - }, - - // Stage 5 - { - - $project: { - - "_id": 0, - "users": 1, - "vib": 1 - - } - - } - ] - - ) - - return_cursor(cursor, req, res, next); - -}); - -router.get('/users/vib', function(req, res, next) { - - var cursor = user_ids_cursor(true); - return_cursor(cursor, req, res, next); - -}); - -router.get('/users/sighted', function(req, res, next) { - - var cursor = user_ids_cursor(false); - return_cursor(cursor, req, res, next); - -}); - -function user_ids_cursor(vib){ - - var filter_condition = {$eq: 0}; - - if(vib==true){ - - filter_condition = {$gt: 0} - - } - - var collection = icarusDb.collection('resources'); - - return collection.aggregate( - - // Pipeline - [ - // Stage 1 - { - $match: { - "appdata.appname":"Invisible Puzzle", - "debug":false - } - }, - - // Stage 2 - { - $group: { - "_id": "$appdata.uuid", - "docs": {$sum: 1}, - "voiceover": {$sum : {$cond: [{$eq:["$appdata.voiceover", true]},1,0]}}, - "levels" : { - "$addToSet" : "$userdata.level.id" - }, - "sonifications" : { - "$addToSet" : "$userdata.sonification" - } - } - - }, - - // Stage 3 - { - $project: { - - "docs": 1, - "vo_ratio": {$divide:["$voiceover","$docs"]}, - "levels": 1, - "sonification": 1 - - } - }, - - // Stage 4 - { - $match: { - - "vo_ratio": filter_condition - - } - } - - ] - - ) - -} - -router.get('/explorations/hp', function(req, res, next) { - - var collection = icarusDb.collection('resources'); - - var cursor = collection.aggregate( - - // Pipeline - [ - // Stage 1 - { - $match: { - "appdata.appname" : "Invisible Puzzle", - "userdata.event" : "exploration", - "appdata.voiceover": true, - "debug" : false - } - }, - - // Stage 2 - { - $group: { - "_id" : 1, - "explorations" : { - "$sum" : 1 - }, - "with_hp" : { - "$sum" : { - "$cond" : [ - { - "$eq" : [ - "$userdata.headphones", - true - ] - }, - 1, - 0 - ] - } - } - } - } - - ] - - ); - - return_cursor(cursor, req, res, next); - -}); - -router.get('/explorations/hpbylevel', function(req, res, next) { - - var collection = icarusDb.collection('resources'); - - var cursor = collection.aggregate( - - // Pipeline - [ - // Stage 1 - { - $match: { - "appdata.appname" : "Invisible Puzzle", - "userdata.event" : "exploration", - "appdata.voiceover": true, - "debug" : false - } - }, - - // Stage 2 - { - $group: { - "_id" : "$userdata.level.id", - "explorations" : { - "$sum" : 1 - }, - "with_hp" : { - "$sum" : { - "$cond" : [ - { - "$eq" : [ - "$userdata.headphones", - true - ] - }, - 1, - 0 - ] - } - } - } - }, - - // Stage 3 - { - $project: { - "_id": 1, - "explorations": 1, - "hp_ratio": {$divide:["$with_hp","$explorations"]} - } - }, - - // Stage 4 - { - $sort: { - "_id": 1 - } - } - - ] - - ); - - - return_cursor(cursor, req, res, next); - -}); - -router.get('/sonifications/bylevel', function(req, res, next) { - - var collection = icarusDb.collection('resources'); - - var cursor = collection.aggregate( - - // Pipeline - [ - // Stage 1 - { - $match: { - "appdata.appname" : "Invisible Puzzle", - "userdata.event" : "exploration", - "appdata.voiceover": true, - "debug" : false - } - }, - - // Stage 2 - { - $project: { - "identifier": { - "lvl": "$userdata.level.id", - "son": "$userdata.sonification" - } - } - }, - - // Stage 3 - { - $group: { - "_id": "$identifier", - "count": {$sum: 1} - } - } - - ] - - ); - - return_cursor(cursor, req, res, next); - -}); - -function return_cursor(cursor, req, res, next){ - - cursor.toArray(function(err, result) { - - if(err!=null){ - - debug(err); - next(err); - - }else{ - - if(result==undefined){ - - res.sendStatus(404); - - }else{ - - res.send(200,result); - - } - - } - - }); - -} - -module.exports = router; \ No newline at end of file -- 2.18.1