Merge pull request #25 from IBM-Cloud/icd-mongoDB

Update code to use ICD for MongoDB

Author: VidyasagarMSC

.env.example

@@ -3,3 +3,7 @@ SESSION_SECRET=
 
 # URL for your local mongodb installation. The below value is likely correct unless you setup your MongoDB configuration differently.
 LOCAL_MONGODB_URL=mongodb://localhost:27017
+# Certificate - needed for connecting to IBM Cloud Databases for MongoDB
+CERTIFICATE_BASE64=
+PORT=6001
+BIND=0.0.0.0

Dockerfile

@@ -0,0 +1,24 @@
+FROM node:8
+
+# Create app directory
+RUN mkdir /src
+WORKDIR /src
+
+
+
+# If you are building your code for production
+# RUN npm ci --only=production
+
+COPY ./package*.json /src/
+
+RUN npm install
+
+# Bundle app source
+COPY ./server /src/server
+COPY ./public /src/public
+COPY ./server.js /src/server.js
+COPY ./.env /src/.env
+
+
+EXPOSE 6001
+CMD [ "npm", "start" ]

README.md

@@ -1,24 +1,24 @@
 # Modern Web Application using MEAN stack
 
-This is a basic boilerplate for the MEAN stack ([MongoDB](https://www.mongodb.org/), [Express](http://expressjs.com/), [AngularJS](https://angularjs.org/) and [Node.js](https://nodejs.org)) on [IBM Cloud](http://bluemix.net).
+This is a basic boilerplate for the MEAN stack ([MongoDB](https://www.mongodb.org/), [Express](http://expressjs.com/), [AngularJS](https://angularjs.org/) and [Node.js](https://nodejs.org)) on [IBM Cloud](https://cloud.ibm.com).
 
-This application uses the [Compose for MongoDB service](https://console.bluemix.net/catalog/services/compose-for-mongodb) and [Node.js runtime](https://www.ng.bluemix.net/docs/starters/nodejs/index.html) on IBM Cloud.
+This application uses the [IBM Cloud Databases for MongoDB service](https://cloud.ibm.com/catalog/services/databases-for-mongodb) and [Node.js runtime](https://cloud.ibm.com/docs/runtimes/nodejs?topic=Nodejs-nodejs_runtime) on IBM Cloud.
 
-<img src="ReadME-Images/Architecture2.png">
+<img src="ReadME-Images/Architecture.png">
 
 #### Features
 - MVC project structure
 - Create, edit and delete user accounts
 - Authentication with username/password
 - Protected routes that can only be accessed by authenticated users
 - Bootstrap CSS framework & [Cosmo theme](https://bootswatch.com/cosmo/)
-- HTTPS built-in if deployed to [IBM Cloud](#deploy-to-bluemix)
+- HTTPS built-in if deployed to [IBM Cloud](#deploy-to-ibm-cloud)
 - [Mongoose](https://github.com/Automattic/mongoose) for MongoDB interactions.
 - [PassportJS](http://passportjs.org) for authentication, with over 300 authentication strategies to pick from.
 
 ## Application Requirements
 - [Node.js & NPM](https://nodejs.org/en/download/)
-- [Compose for MongoDB database](https://console.bluemix.net/catalog/compose-for-mongodb)
+- [IBM Cloud Databases for MongoDB](https://cloud.ibm.com/catalog/services/databases-for-mongodb)
 - [Cloud Foundry Command Line Tool](https://docs.cloudfoundry.org/devguide/installcf/)
 
 ## Getting Started
@@ -31,35 +31,38 @@ This application uses the [Compose for MongoDB service](https://console.bluemix.
 6. Run `node server.js` to start your app
 7. Open a browser to the link provided in the terminal prompt to view your app
 
+Note that the code assumes a secured connection to MongoDB using SSL and a certificate. This way you can run the app locally but connect to IBM Cloud Databases for MongoDB.
+
+An alternative way of local development is using the provided Dockerfile.
+
 ##### Deploy to IBM Cloud
 
 Option 1 (launch this app directly from this repo):
 
-[![Deploy to Bluemix](https://bluemix.net/deploy/button.png)](https://bluemix.net/deploy?repository=https://github.com/IBM-Bluemix/Nodejs-MEAN-Stack)
+[![Deploy to IBM Cloud](https://cloud.ibm.com/devops/setup/deploy/button.png)](https://cloud.ibm.com/devops/setup/deploy?repository=https://github.com/IBM-Cloud/nodejs-MEAN-stack)
 
 Option 2 (deploy from your local machine):
 
 1. Clone or download this repo onto your machine.
 2. Open a terminal prompt to the directory of your application.
-3. If you don't have an account, [create a free one here](https://console.ng.bluemix.net/registration/).
-4. Set your Cloud Foundry CLI tool's API endpoint to: `ibmcloud api https://api.ng.bluemix.net `
-5. Login to your account via the command line: `ibmcloud login`
-6. Target your account ORG and SPACE  `ibmcloud target -o ORG -s SPACE`
-7. Create the instance of Compose for MongoDB on IBM Cloud:  `ibmcloud cf create-service compose-for-mongodb Standard mean-starter-mongodb`
-8. Push your app to IBM Cloud with `ibmcloud cf push`
-9. Done, the app should be looking like:<img src="ReadME-Images/live-app.png">
+3. If you don't have an account, [create a free one here](https://cloud.ibm.com).
+4. Login to your account via the command line: `ibmcloud login`
+5. Target your account ORG and SPACE  `ibmcloud target --cf`
+6. Create the instance of Compose for MongoDB on IBM Cloud:  `ibmcloud cf create-service databases-for-mongodb standard mean-starter-mongodb`
+7. Push your app to IBM Cloud with `ibmcloud cf push`
+8. Done, the app should be looking like:<img src="ReadME-Images/live-app.png">
 
 
 
 #### Problems or Questions?
 
-Create a [GitHub issue](https://github.com/IBM-Bluemix/nodejs-MEAN-stack/issues/new) for questions or problems occurs using this demo. 
+Create a [GitHub issue](https://github.com/IBM-Cloud/nodejs-MEAN-stack/issues/new) for questions or problems occurs using this demo. 
 
 ## Critical Files & Folders
 
 | File                               | Description                                                  |
 | ---------------------------------- | ------------------------------------------------------------ |
-| [**manifest.yml**](./manifest.yml) | File that defines deployment paramaters. [More info here](https://www.ng.bluemix.net/docs/manageapps/depapps.html#appmanifest)
+| [**manifest.yml**](./manifest.yml) | File that defines deployment paramaters. [More info here](http://docs.cloudfoundry.org/devguide/deploy-apps/manifest.html)
 | [**.env.example**](./.env.example) | Set custom [environment variables](https://en.wikipedia.org/wiki/Environment_variable) for your application. This is the proper way to store credentials and other sensitive values.
 | [**server.js**](./server.js) | Main server file that the Node.js runtime uses. It contains all the server logic.
 | [**/server**](./server) | Folder for files used by the Node.js server
@@ -92,7 +95,7 @@ If you are not sure what your application name is, use this command to print you
   $ ibmcloud cf apps
   ```
 
-For more detailed information on troubleshooting your application, see the [Troubleshooting section](https://www.ng.bluemix.net/docs/troubleshoot/tr.html) in the documentation.
+For more detailed information on troubleshooting your application, see the [Troubleshooting section](https://cloud.ibm.com/docs/cloud-foundry-public?topic=cloud-foundry-public-ts-cf-apps) in the documentation.
 
 ## License
-See [LICENSE.MD](https://github.com/IBM-Bluemix/Nodejs-MEAN-Stack/blob/master/LICENSE.md) for license information.
+See [LICENSE.MD](https://github.com/IBM-Cloud/nodejs-MEAN-stack/blob/master/LICENSE.md) for license information.

ReadME-Images/Architecture.png

@@ -1,13 +1,13 @@
 ---
 applications:
 - name: mean-stack
-  host: mean-${random-word}
+  random-route: true
   memory: 256M
   services:
   - mean-starter-mongodb
   env:
     NODE_ENV: cloud-foundry
 declared-services:
   mean-starter-mongodb:
-    label: compose-for-mongodb
-    plan: Standard
+    label: databases-for-mongodb
+    plan: standard