From 9cafc49e9c6056060907444070e9d427655557d9 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Fri, 20 Jan 2017 20:12:13 +0530
Subject: [PATCH 1/4] adds `bootstrap_express_app` function

---
 bitnami/express/rootfs/app-entrypoint.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bitnami/express/rootfs/app-entrypoint.sh b/bitnami/express/rootfs/app-entrypoint.sh
index afc208f2a55b..127ac7570c19 100755
--- a/bitnami/express/rootfs/app-entrypoint.sh
+++ b/bitnami/express/rootfs/app-entrypoint.sh
@@ -62,6 +62,11 @@ wait_for_db() {
   fi
 }
 
+bootstrap_express_app() {
+  log "Creating express application"
+  express . -f
+}
+
 add_database_support() {
   if database_tier_exists; then
     if getent hosts mongodb >/dev/null && ! npm ls mongodb >/dev/null; then
@@ -126,8 +131,7 @@ if [ "$1" == npm ] && [ "$2" == "start" -o "$2" == "run" ]; then
   wait_for_db
 
   if ! app_present; then
-    log "Creating express application"
-    express . -f
+    bootstrap_express_app
     add_database_support
     add_sample_code
   fi

From 83ce414b61fbe82cc7992c370319fdd54e48a485 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Fri, 20 Jan 2017 20:40:32 +0530
Subject: [PATCH 2/4] install and use nodemon in `npm start` command

---
 bitnami/express/rootfs/app-entrypoint.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bitnami/express/rootfs/app-entrypoint.sh b/bitnami/express/rootfs/app-entrypoint.sh
index 127ac7570c19..5b82dd300995 100755
--- a/bitnami/express/rootfs/app-entrypoint.sh
+++ b/bitnami/express/rootfs/app-entrypoint.sh
@@ -65,6 +65,10 @@ wait_for_db() {
 bootstrap_express_app() {
   log "Creating express application"
   express . -f
+
+  log "Adding nodemon npm module (dev)"
+  npm install nodemon --save-dev
+  sed -i 's,node ./bin/www,nodemon ./bin/www,' package.json
 }
 
 add_database_support() {

From ef4b269caa2878c6ef6ac2e538b93f5413a90515 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Fri, 20 Jan 2017 20:41:53 +0530
Subject: [PATCH 3/4] pretty prints

---
 bitnami/express/rootfs/app-entrypoint.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bitnami/express/rootfs/app-entrypoint.sh b/bitnami/express/rootfs/app-entrypoint.sh
index 5b82dd300995..b5958423ed76 100755
--- a/bitnami/express/rootfs/app-entrypoint.sh
+++ b/bitnami/express/rootfs/app-entrypoint.sh
@@ -74,14 +74,17 @@ bootstrap_express_app() {
 add_database_support() {
   if database_tier_exists; then
     if getent hosts mongodb >/dev/null && ! npm ls mongodb >/dev/null; then
+      log "Adding mongodb npm module"
       npm install --save mongodb
     fi
 
     if getent hosts mariadb >/dev/null && ! npm ls mysql >/dev/null || getent hosts mysql >/dev/null && ! npm ls mysql >/dev/null; then
+      log "Adding mysql npm module"
       npm install --save mysql
     fi
 
     if getent hosts postgresql >/dev/null && ! npm ls pg pg-hstore >/dev/null; then
+      log "Adding pg pg-hstore npm modules"
       npm install --save pg pg-hstore
     fi
   fi

From e21851ca86dadbb1ee86e5a1e6a7788bce3e9d4c Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Fri, 20 Jan 2017 22:36:21 +0530
Subject: [PATCH 4/4] bump revision to `4.14.0-r18`

---
 bitnami/express/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitnami/express/Dockerfile b/bitnami/express/Dockerfile
index c8d12c8dd0cd..62f3acb67b81 100644
--- a/bitnami/express/Dockerfile
+++ b/bitnami/express/Dockerfile
@@ -19,7 +19,7 @@ RUN rm -rf /app
 
 # ExpressJS template
 ENV BITNAMI_APP_NAME=express
-ENV BITNAMI_IMAGE_VERSION=4.14.0-r17
+ENV BITNAMI_IMAGE_VERSION=4.14.0-r18
 
 COPY rootfs/ /