Update node version to 10

Author: M-Ayman

result/Dockerfile

@@ -1,16 +1,19 @@
-FROM node:5.11.0-slim
+FROM node:10-slim
 
 WORKDIR /app
 
 RUN npm install -g nodemon
-ADD package.json /app/package.json
-RUN npm config set registry http://registry.npmjs.org
-RUN npm install && npm ls
-RUN mv /app/node_modules /node_modules
 
-ADD . /app
+COPY package*.json ./
+
+RUN npm ci \
+ && npm cache clean --force \
+ && mv /app/node_modules /node_modules
+
+COPY . .
 
 ENV PORT 80
+
 EXPOSE 80
 
-CMD ["node", "server.js"]
+CMD ["node", "server.js"]

result/package.json

@@ -9,12 +9,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "body-parser": "^1.14.1",
-    "cookie-parser": "^1.4.0",
-    "express": "^4.13.3",
-    "method-override": "^2.3.5",
-    "async": "^1.5.0",
-    "pg": "^4.4.3",
-    "socket.io": "^1.3.7"
+    "async": "^3.1.0",
+    "body-parser": "^1.19.0",
+    "cookie-parser": "^1.4.4",
+    "express": "^4.17.1",
+    "method-override": "^3.0.0",
+    "pg": "^7.12.1",
+    "socket.io": "^2.2.0",
+    "stoppable": "^1.1.0"
   }
-}
+}

result/server.js

@@ -1,6 +1,8 @@
 var express = require('express'),
     async = require('async'),
-    pg = require("pg"),
+    pg = require('pg'),
+    { Pool } = require('pg'),
+    path = require('path'),
     cookieParser = require('cookie-parser'),
     bodyParser = require('body-parser'),
     methodOverride = require('method-override'),
@@ -21,10 +23,14 @@ io.sockets.on('connection', function (socket) {
   });
 });
 
+var pool = new pg.Pool({
+  connectionString: 'postgres://postgres:postgres@db/postgres'
+});
+
 async.retry(
   {times: 1000, interval: 1000},
   function(callback) {
-    pg.connect('postgres://postgres_user:postgres_password@db/postgres', function(err, client, done) {
+    pool.connect(function(err, client, done) {
       if (err) {
         console.error("Waiting for db");
       }
@@ -33,7 +39,7 @@ async.retry(
   },
   function(err, client) {
     if (err) {
-      return console.err("Giving up");
+      return console.error("Giving up");
     }
     console.log("Connected to db");
     getVotes(client);
@@ -82,4 +88,4 @@ app.get('/', function (req, res) {
 server.listen(port, function () {
   var port = server.address().port;
   console.log('App running on port ' + port);
-});
+});