Update code/packages

Author: DanWahlin

README.md

@@ -7,13 +7,13 @@ Interested in learning more about Docker? Visit https://www.pluralsight.com/cour
 
 ### Starting the Application with Docker Containers:
 
-1. Install Docker for Windows or Docker for Mac (If you're on Windows 7 install Docker Toolbox: http://docker.com/toolbox).
+1. Install [Docker Desktop](https://docker.com/get-started)
 
 2. Open a command prompt.
 
 3. Run the commands listed in `node.dockerfile` (see the comments at the top of the file).
 
-4. Navigate to http://localhost:3000. Use http://192.168.99.100:8080 in your browser to view the site if using Docker toolbox. This assumes that's the IP assigned to VirtualBox - change if needed.
+4. Navigate to http://localhost:3000.
 
 
 ### Starting the Application with Docker Compose

lib/dataSeeder.js

@@ -1,54 +1,49 @@
-'use strict';
-
-var DockerCommand = require('../models/dockerCommand');
+const DockerCommand = require('../models/dockerCommand');
 
 var dataInitializer = function () {
 
-    var initializeData = function(callback) {
-           
-            var runDockerCommand = new DockerCommand({
-                command             : 'run',
-                description         : 'Runs a Docker container',
-                examples            : [
-                    {
-                        example: 'docker run imageName',
-                        description: 'Creates a running container from the image. Pulls it from Docker Hub if the image is not local'
-                    },
-                    {
-                        example: 'docker run -d -p 8080:3000 imageName',
-                        description: 'Runs a container in "detached" mode with an external port of 8080 and a container port of 3000.'
-                    }
-                ]});
-             
-             runDockerCommand.save(function(err) {
-                 if (err) {
-                     return callback(err);                     
-                 }
-             });
-             
-            var psDockerCommand = new DockerCommand({
-                command             : 'ps',
-                description         : 'Lists containers',
-                examples            : [
-                    {
-                        example: 'docker ps',
-                        description: 'Lists all running containers'
-                    },
-                    {
-                        example: 'docker ps -a',
-                        description: 'Lists all containers (even if they are not running)'
-                    }
-                ]});
-             
-             psDockerCommand.save(function(err) {
-                 if (err) {
-                     return callback(err);                     
-                 }
-             });
-
-             callback();
-
-        };
+    const initializeData = async (callback) => {
+
+        const runDockerCommand = new DockerCommand({
+            command: 'run',
+            description: 'Runs a Docker container',
+            examples: [
+                {
+                    example: 'docker run imageName',
+                    description: 'Creates a running container from the image. Pulls it from Docker Hub if the image is not local'
+                },
+                {
+                    example: 'docker run -d -p 8080:3000 imageName',
+                    description: 'Runs a container in "detached" mode with an external port of 8080 and a container port of 3000.'
+                }
+            ]
+        });
+
+        const psDockerCommand = new DockerCommand({
+            command: 'ps',
+            description: 'Lists containers',
+            examples: [
+                {
+                    example: 'docker ps',
+                    description: 'Lists all running containers'
+                },
+                {
+                    example: 'docker ps -a',
+                    description: 'Lists all containers (even if they are not running)'
+                }
+            ]
+        });
+
+
+        try {
+            await runDockerCommand.save();
+            await psDockerCommand.save();
+            callback();
+        } catch (err) {
+            callback(err);
+        }
+
+    };
 
 
     return {

lib/database.js

@@ -4,10 +4,9 @@ var mongoose = require('mongoose');
 var database = function () {
     var conn = null,
 
-        init = function (config) {
+        init = (config) => {
             console.log('Trying to connect to ' + config.host + '/' + config.database + ' MongoDB database');
             var options = {
-                promiseLibrary: global.Promise,
                 useNewUrlParser: true,
                 useUnifiedTopology: true
             };
@@ -16,15 +15,13 @@ var database = function () {
             mongoose.connect(connString, options);
             conn = mongoose.connection;
             conn.on('error', console.error.bind(console, 'connection error:'));
-            conn.once('open', function() {
-                console.log('db connection open');
-            });
+            conn.once('open', () => console.log('db connection open'));
             return conn;
         },
 
-        close = function() {
+        close = () => {
             if (conn) {
-                conn.close(function () {
+                conn.close(() => {
                     console.log('Mongoose default connection disconnected through app termination');
                     process.exit(0);
                 });

lib/dockerCommandsRepository.js

@@ -1,25 +1,14 @@
-'use strict';
-
-var DockerCommand = require('../models/dockerCommand');
-
-var dockerCommandsRepository = function() {
-
-    var getDockerCommands = function(callback) {
-
-        DockerCommand.find(function(err, commands) {
-
-            if (err) return callback(err, null);
-
-            callback(err, commands);
-
-        });
-
-    };
-
-    return {
-        getDockerCommands : getDockerCommands
-    };
-
-}();
-
-module.exports = dockerCommandsRepository;
+const DockerCommand = require('../models/dockerCommand');
+
+const getDockerCommands = async () => {
+        try {
+            const commands = await DockerCommand.find();
+            return commands;
+        }
+        catch (err)
+        {
+            return [];
+        }
+};
+
+module.exports = getDockerCommands;

node.dockerfile

@@ -1,12 +1,13 @@
-# Build: docker build -f node.dockerfile -t danwahlin/nodeapp .
+# Build: docker build -f node.dockerfile -t nodeapp .
 
 # Option 1: Create a custom bridge network and add containers into it
 
 # docker network create --driver bridge isolated_network
 # docker run -d --net=isolated_network --name mongodb mongo
 
-# NOTE: $(pwd) in the following line is for Mac and Linux. See https://blog.codewithdan.com/docker-volumes-and-print-working-directory-pwd/ for Windows examples.
-# docker run -d --net=isolated_network --name nodeapp -p 3000:3000 -v $(pwd)/logs:/var/www/logs danwahlin/nodeapp
+# NOTE: $(pwd) in the following line is for Mac and Linux. Use ${PWD} for Powershell. 
+# See https://blog.codewithdan.com/docker-volumes-and-print-working-directory-pwd/ syntax examples.
+# docker run -d --net=isolated_network --name nodeapp -p 3000:3000 -v $(pwd)/logs:/var/www/logs nodeapp
 
 # Seed the database with sample database
 # Run: docker exec nodeapp node dbSeeder.js
@@ -27,7 +28,7 @@ ENV         TERM xterm
 RUN         apk update && apk add $PACKAGES
 
 WORKDIR     /var/www
-COPY        package.json package-lock.json ./
+COPY        package*.json ./
 RUN         npm install
 
 COPY        . ./