Applying suggestions from code review

14-minimal/README.md

@@ -213,7 +213,10 @@ Application developers can use the following environment variables to configure
        Select an alternate / custom runtime mode, defined in your `package.json` file's [`scripts`](https://docs.npmjs.com/misc/scripts) section (default: npm run "start"). These user-defined run-scripts are unavailable while `DEV_MODE` is in use.
 
 **`NODE_CMD`**  
-       When specified (e.g.Specify `NODE_CMD="node server.js"`) the `NODE_CMD` is executed by the `init-wrapper` script, which handles reaping zombie processes and signal forwarding (SIGINT, SIGTERM) to Node.js application.
+       When specified (e.g.Specify `NODE_CMD="node server.js"`) the value of `NODE_CMD` is used to start the application instead of `npm start`.
+
+**`INIT_WRAPPER`**  
+       When set to "true", the application is started via the `init-wrapper` script instead of using `npm start`, by looking for the presence of the files `server.js`, `index.js` or `main.js` in the order in which they are listed. In case of `NODE_CMD` environemnt variale is specified, then `init-wrapper` script will use the value of `NODE_CMD` to start your application.
 
 #### Additional variables used in the full-sized image
 
@@ -318,13 +321,14 @@ Below is an example _package.json_ file with the _main_ attribute and _start_ sc
 
 ## init-wrapper
 
-init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used for preventing below circumstances:
+init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used to handle:
 
 - Proper signal handling and propagation, as Node.js was not designed to run as PID 1.
 - Reaping zombie child processes
-- Avoiding use of npm, more information on [reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application)
+Avoiding use of npm, there is more information on why you want to avoid that in the [Node.js reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application). When the INIT_WRAPPER is set to true the application is started via the init script instead of using npm start.
 
-A detailed explanation on how the init-wrapper script works is avalable on [this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
+A detailed explanation on how the init-wrapper script works is avalable in
+[this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
 
 Example of using init-wrapper:
 

14-minimal/s2i/bin/run

@@ -29,11 +29,10 @@ run_node() {
       echo "exec $NODE_CMD"
     fi
   elif [ "$INIT_WRAPPER" == true ]; then
-
     if [ -f "server.js" ]; then
       start_file="server.js"
     elif [ -f "index.js" ]; then
-      start_file="main.js"
+      start_file="index.js"
     elif [ -f "main.js" ]; then
       start_file="main.js"
     else

14/README.md

@@ -143,7 +143,10 @@ Application developers can use the following environment variables to configure
        Select an alternate / custom runtime mode, defined in your `package.json` file's [`scripts`](https://docs.npmjs.com/misc/scripts) section (default: npm run "start"). These user-defined run-scripts are unavailable while `DEV_MODE` is in use.
 
 **`NODE_CMD`**  
-       When specified e.g. `NODE_CMD="node server.js"` the application will start by using the command `node server.js`.
+       When specified (e.g.Specify `NODE_CMD="node server.js"`) the value of `NODE_CMD` is used to start the application instead of `npm start`.
+
+**`INIT_WRAPPER`**  
+       When set to "true", the application is started via the `init-wrapper` script instead of using `npm start`, by looking for the presence of the files `server.js`, `index.js` or `main.js` in the order in which they are listed. In case of `NODE_CMD` environemnt variale is specified, then `init-wrapper` script will use the value of `NODE_CMD` to start your application.
 
 **`HTTP_PROXY`**  
        Use an npm proxy during assembly
@@ -250,13 +253,14 @@ Below is an example _package.json_ file with the _main_ attribute and _start_ sc
 
 ## init-wrapper
 
-init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used for preventing below circumstances:
+init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used to handle:
 
 - Proper signal handling and propagation, as Node.js was not designed to run as PID 1.
 - Reaping zombie child processes
-- Avoiding use of npm, more information on [reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application)
+Avoiding use of npm, there is more information on why you want to avoid that in the [Node.js reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application). When the INIT_WRAPPER is set to true the application is started via the init script instead of using npm start.
 
-A detailed explanation on how the init-wrapper script works is avalable on [this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
+A detailed explanation on how the init-wrapper script works is avalable in
+[this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
 
 Example of using init-wrapper:
 

14/s2i/bin/run

@@ -29,11 +29,10 @@ run_node() {
       echo "exec $NODE_CMD"
     fi
   elif [ "$INIT_WRAPPER" == true ]; then
-
     if [ -f "server.js" ]; then
       start_file="server.js"
     elif [ -f "index.js" ]; then
-      start_file="main.js"
+      start_file="index.js"
     elif [ -f "main.js" ]; then
       start_file="main.js"
     else

16-minimal/README.md

@@ -213,7 +213,10 @@ Application developers can use the following environment variables to configure
        Select an alternate / custom runtime mode, defined in your `package.json` file's [`scripts`](https://docs.npmjs.com/misc/scripts) section (default: npm run "start"). These user-defined run-scripts are unavailable while `DEV_MODE` is in use.
 
 **`NODE_CMD`**  
-       When specified (e.g.Specify `NODE_CMD="node server.js"`) the `NODE_CMD` is executed by the `init-wrapper` script, which handles reaping zombie processes and signal forwarding (SIGINT, SIGTERM) to Node.js application.
+       When specified (e.g.Specify `NODE_CMD="node server.js"`) the value of `NODE_CMD` is used to start the application instead of `npm start`.
+
+**`INIT_WRAPPER`**  
+       When set to "true", the application is started via the `init-wrapper` script instead of using `npm start`, by looking for the presence of the files `server.js`, `index.js` or `main.js` in the order in which they are listed. In case of `NODE_CMD` environemnt variale is specified, then `init-wrapper` script will use the value of `NODE_CMD` to start your application.
 
 
 #### Additional variables used in the full-sized image
@@ -319,13 +322,14 @@ Below is an example _package.json_ file with the _main_ attribute and _start_ sc
 
 ## init-wrapper
 
-init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used for preventing below circumstances:
+init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used to handle:
 
 - Proper signal handling and propagation, as Node.js was not designed to run as PID 1.
 - Reaping zombie child processes
-- Avoiding use of npm, more information on [reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application)
+Avoiding use of npm, there is more information on why you want to avoid that in the [Node.js reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application). When the INIT_WRAPPER is set to true the application is started via the init script instead of using npm start.
 
-A detailed explanation on how the init-wrapper script works is avalable on [this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
+A detailed explanation on how the init-wrapper script works is avalable in
+[this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
 
 Example of using init-wrapper:
 

16-minimal/s2i/bin/run

@@ -29,11 +29,10 @@ run_node() {
       echo "exec $NODE_CMD"
     fi
   elif [ "$INIT_WRAPPER" == true ]; then
-
     if [ -f "server.js" ]; then
       start_file="server.js"
     elif [ -f "index.js" ]; then
-      start_file="main.js"
+      start_file="index.js"
     elif [ -f "main.js" ]; then
       start_file="main.js"
     else

16/README.md

@@ -143,7 +143,10 @@ Application developers can use the following environment variables to configure
        Select an alternate / custom runtime mode, defined in your `package.json` file's [`scripts`](https://docs.npmjs.com/misc/scripts) section (default: npm run "start"). These user-defined run-scripts are unavailable while `DEV_MODE` is in use.
 
 **`NODE_CMD`**  
-       When specified (e.g.Specify `NODE_CMD="node server.js"`) the `NODE_CMD` is executed by the `init-wrapper` script, which handles reaping zombie processes and signal forwarding (SIGINT, SIGTERM) to Node.js application.
+       When specified (e.g.Specify `NODE_CMD="node server.js"`) the value of `NODE_CMD` is used to start the application instead of `npm start`.
+
+**`INIT_WRAPPER`**  
+       When set to "true", the application is started via the `init-wrapper` script instead of using `npm start`, by looking for the presence of the files `server.js`, `index.js` or `main.js` in the order in which they are listed. In case of `NODE_CMD` environemnt variale is specified, then `init-wrapper` script will use the value of `NODE_CMD` to start your application.
 
 **`HTTP_PROXY`**  
        Use an npm proxy during assembly
@@ -246,13 +249,14 @@ Below is an example _package.json_ file with the _main_ attribute and _start_ sc
 
 ## init-wrapper
 
-init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used for preventing below circumstances:
+init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used to handle:
 
 - Proper signal handling and propagation, as Node.js was not designed to run as PID 1.
 - Reaping zombie child processes
-- Avoiding use of npm, more information on [reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application)
+Avoiding use of npm, there is more information on why you want to avoid that in the [Node.js reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application). When the INIT_WRAPPER is set to true the application is started via the init script instead of using npm start.
 
-A detailed explanation on how the init-wrapper script works is avalable on [this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
+A detailed explanation on how the init-wrapper script works is avalable in
+[this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
 
 Example of using init-wrapper:
 

16/s2i/bin/run

@@ -29,11 +29,10 @@ run_node() {
       echo "exec $NODE_CMD"
     fi
   elif [ "$INIT_WRAPPER" == true ]; then
-
     if [ -f "server.js" ]; then
       start_file="server.js"
     elif [ -f "index.js" ]; then
-      start_file="main.js"
+      start_file="index.js"
     elif [ -f "main.js" ]; then
       start_file="main.js"
     else

18-minimal/README.md

@@ -213,7 +213,10 @@ Application developers can use the following environment variables to configure
        Select an alternate / custom runtime mode, defined in your `package.json` file's [`scripts`](https://docs.npmjs.com/misc/scripts) section (default: npm run "start"). These user-defined run-scripts are unavailable while `DEV_MODE` is in use.
 
 **`NODE_CMD`**  
-       When specified (e.g.Specify `NODE_CMD="node server.js"`) the `NODE_CMD` is executed by the `init-wrapper` script, which handles reaping zombie processes and signal forwarding (SIGINT, SIGTERM) to Node.js application.
+       When specified (e.g.Specify `NODE_CMD="node server.js"`) the value of `NODE_CMD` is used to start the application instead of `npm start`.
+
+**`INIT_WRAPPER`**  
+       When set to "true", the application is started via the `init-wrapper` script instead of using `npm start`, by looking for the presence of the files `server.js`, `index.js` or `main.js` in the order in which they are listed. In case of `NODE_CMD` environemnt variale is specified, then `init-wrapper` script will use the value of `NODE_CMD` to start your application.
 
 #### Additional variables used in the full-sized image
 
@@ -318,13 +321,14 @@ Below is an example _package.json_ file with the _main_ attribute and _start_ sc
 
 ## init-wrapper
 
-init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used for preventing below circumstances:
+init-wrapper script is located on `/usr/libexec/s2i/init-wrapper` and is used to handle:
 
 - Proper signal handling and propagation, as Node.js was not designed to run as PID 1.
 - Reaping zombie child processes
-- Avoiding use of npm, more information on [reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application)
+Avoiding use of npm, there is more information on why you want to avoid that in the [Node.js reference architecture](https://github.com/nodeshift/nodejs-reference-architecture/blob/e4c4dc1fd20c2cac392e862859aaad27f85d504f/docs/development/building-good-containers.md#avoiding-using-npm-to-start-application). When the INIT_WRAPPER is set to true the application is started via the init script instead of using npm start.
 
-A detailed explanation on how the init-wrapper script works is avalable on [this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
+A detailed explanation on how the init-wrapper script works is avalable in
+[this url](http://veithen.io/2014/11/16/sigterm-propagation.html).
 
 Example of using init-wrapper:
 

18-minimal/s2i/bin/run

@@ -29,11 +29,10 @@ run_node() {
       echo "exec $NODE_CMD"
     fi
   elif [ "$INIT_WRAPPER" == true ]; then
-
     if [ -f "server.js" ]; then
       start_file="server.js"
     elif [ -f "index.js" ]; then
-      start_file="main.js"
+      start_file="index.js"
     elif [ -f "main.js" ]; then
       start_file="main.js"
     else

18/README.md

@@ -143,7 +143,10 @@ Application developers can use the following environment variables to configure
        Select an alternate / custom runtime mode, defined in your `package.json` file's [`scripts`](https://docs.npmjs.com/misc/scripts) section (default: npm run "start"). These user-defined run-scripts are unavailable while `DEV_MODE` is in use.
 
 **`NODE_CMD`**  
-       When specified (e.g.Specify `NODE_CMD="node server.js"`) the `NODE_CMD` is executed by the `init-wrapper` script, which handles reaping zombie processes and signal forwarding (SIGINT, SIGTERM) to Node.js application.
+       When specified (e.g.Specify `NODE_CMD="node server.js"`) the value of `NODE_CMD` is used to start the application instead of `npm start`.
+
+**`INIT_WRAPPER`**  
+       When set to "true", the application is started via the `init-wrapper` script instead of using `npm start`, by looking for the presence of the files `server.js`, `index.js` or `main.js` in the order in which they are listed. In case of `NODE_CMD` environemnt variale is specified, then `init-wrapper` script will use the value of `NODE_CMD` to start your application.
 
 **`HTTP_PROXY`**  
        Use an npm proxy during assembly

18/s2i/bin/run

@@ -29,11 +29,10 @@ run_node() {
       echo "exec $NODE_CMD"
     fi
   elif [ "$INIT_WRAPPER" == true ]; then
-
     if [ -f "server.js" ]; then
       start_file="server.js"
     elif [ -f "index.js" ]; then
-      start_file="main.js"
+      start_file="index.js"
     elif [ -f "main.js" ]; then
       start_file="main.js"
     else