Updated to use Code Engine

Author: dprosper

Dockerfile

@@ -1,28 +1,9 @@
-FROM node:14
+FROM node:16-alpine
 
 # Create app directory
-
-# RUN mkdir /src 
-# This command above fails on Code Engine:
-   # Feb 3 06:02:21 Code Engine mean-stack-local-build-run-220203-060041645-cb7j7-pod-zflpk #5 [2/8] RUN mkdir /src
-   # Feb 3 06:02:21 Code Engine mean-stack-local-build-run-220203-060041645-cb7j7-pod-zflpk #5 0.079 container_linux.go:380: starting container process caused: process_linux.go:385: applying cgroup configuration for process caused: mountpoint for devices not found
-   # Feb 3 06:02:21 Code Engine mean-stack-local-build-run-220203-060041645-cb7j7-pod-zflpk #5 ERROR: process "/bin/sh -c mkdir /src" did not complete successfully: exit code: 1
-   # Feb 3 06:02:21 Code Engine mean-stack-local-build-run-220203-060041645-cb7j7-pod-zflpk ------
-   #  > [2/8] RUN mkdir /src:
-   # Feb 3 06:02:21 Code Engine mean-stack-local-build-run-220203-060041645-cb7j7-pod-zflpk #5 0.079 container_linux.go:380: starting container process caused: process_linux.go:385: applying cgroup configuration for process caused: mountpoint for devices not found
-   # Feb 3 06:02:21 Code Engine mean-stack-local-build-run-220203-060041645-cb7j7-pod-zflpk ------
-   # Feb 3 06:02:21 Code Engine mean-stack-local-build-run-220203-060041645-cb7j7-pod-zflpk Dockerfile:4
-   ## Feb 3 06:02:21 Code Engine mean-stack-local-build-run-220203-060041645-cb7j7-pod-zflpk --------------------
-      # 2 |     
-      # 3 |     # Create app directory
-      # 4 | >>> RUN mkdir /src
-      # 5 |     WORKDIR /src
-      # 6 |   
-
+RUN mkdir /src 
 WORKDIR /src
 
-
-
 # If you are building your code for production
 # RUN npm ci --only=production
 
@@ -31,7 +12,7 @@ COPY ./package*.json /src/
 RUN npm install
 
 # Bundle app source
-COPY ./models /src/models
+COPY ./server /src/server
 COPY ./public /src/public
 COPY ./server.js /src/server.js
 

README.md

@@ -2,7 +2,7 @@
 
 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 [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.
+This application uses the [Databases for MongoDB](https://cloud.ibm.com/catalog/services/databases-for-mongodb) and [Code Engine](https://cloud.ibm.com/codeengine) on IBM Cloud.
 
 The code and detailed steps are discussed in the [IBM Cloud solution tutorial](https://cloud.ibm.com/docs/solution-tutorials?topic=solution-tutorials-tutorials) titled [Modern web application using MEAN stack](https://cloud.ibm.com/docs/solution-tutorials?topic=solution-tutorials-mean-stack).
 

ReadME-Images/Architecture.png

@@ -0,0 +1,23 @@
+# Create Container Image
+
+## Using Docker build commands
+
+You will use the provided `Dockerfile`.
+- Install docker on your machine and build the docker image
+  ```
+   docker build . -t mean-stack:v1.0.0
+  ```
+- Run the app locally to verify it works as expected
+  ```
+   docker run -p 8080:8080 --env-file .env -ti mean-stack:v1.0.0 
+
+- Login to your container registry.
+   > Note: If using the IBM Cloud Container registry, don't forger to use `ibmcloud cr login`
+
+- Tag the image with your container registry's namespace/repository name.
+   > Note:For IBM Cloud Container Registry in the US: `docker tag mean-stack:v1.0.0 us.icr.io/<namespace>/mean-stack:1.0.0`
+
+- Push the image.
+   > Note: For IBM Cloud Container Registry in the US: `docker tag mean-stack:v1.0.0 us.icr.io/<namespace>/mean-stack:1.0.0`
+
+- If you are using IBM Cloud Code Engine to run your container image and the containter registry used is the IBM Cloud Container Registry or a non-Public registry, you will be required to setup a secret for reading the image. Follow the steps outlined in here: https://cloud.ibm.com/docs/codeengine?topic=codeengine-add-registry to do just that.

ReadME-Images/log-mon.png

@@ -14,15 +14,12 @@ const LocalStrategy = require('passport-local').Strategy;
 
 // MongoDB connection library
 const mongoose = require('mongoose');
-const User = require('./models/user.model');
+const User = require('./server/models/user.model');
 
 /********************************
  Load environment
  ********************************/
-// const appEnv = require('cfenv').getAppEnv();
-// if (appEnv.isLocal) {
-  require('dotenv').config();// Loads .env file into environment
-// }
+require('dotenv').config();// Loads .env file into environment
 
 /********************************
  MongoDB Connection
@@ -31,20 +28,8 @@ async function initializeDatabase() {
   //Detects environment and connects to appropriate DB
   var caCertificateBase64, mongoDbUrl;
 
-//   if (appEnv.isLocal) {
-    caCertificateBase64 = process.env.CERTIFICATE_BASE64;
-    mongoDbUrl = process.env.MONGODB_URL;
-//   }
-//   // Connect to MongoDB Service on IBM Cloud
-//   else if (!appEnv.isLocal) {
-//     var mongoDbCredentials = appEnv.services["databases-for-mongodb"][0].credentials.connection.mongodb;
-//     caCertificateBase64 = mongoDbCredentials.certificate.certificate_base64
-//     mongoDbUrl = mongoDbCredentials.composed[0];
-//   }
-//   else {
-//     console.log('No configuration found to connect to MongoDB.');
-//     System.exit(1);
-//   }
+  caCertificateBase64 = process.env.CERTIFICATE_BASE64;
+  mongoDbUrl = process.env.MONGODB_URL;
 
   function unicodeToChar(text) {
     return text.replace(/\\u[\dA-F]{4}/gi,
@@ -126,13 +111,7 @@ function configureApp() {
   app.use(bodyParser.json());
   app.use(bodyParser.urlencoded({ extended: true }));
   app.use(cookieParser());
-//   app.use(session({
-//     secret: process.env.SESSION_SECRET || 'this_is_a_default_session_secret_in_case_one_is_not_defined',
-//     resave: true,
-//     store: new MongoStore({ client: mongoose.connection.getClient() }),
-//     saveUninitialized: false,
-//     cookie: { secure: !appEnv.isLocal }
-//   }));
+
   app.use(session({
    secret: process.env.SESSION_SECRET || 'this_is_a_default_session_secret_in_case_one_is_not_defined',
    resave: true,