Merge pull request #187 from TrueCar/toddw/resolve-dockerfile-issue

Resolve Dockerfile issue and pm2 error

docker/generate-dockerfile.js

@@ -15,6 +15,7 @@ var dockerfile = [
                      "ADD . /app",
                      "",
                      "RUN npm install",
+                     "RUN gluestick build",
                      ""
                  ];
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gluestick",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "GlueStick is a command line interface for quickly developing universal web applications using React",
   "main": "src/cli-harmony.js",
   "bin": "src/cli-harmony.js",

src/commands/start-server.js

@@ -45,8 +45,16 @@ module.exports = function startServer (debug=false) {
     }
 
     // Stop any previous processes with the same name before starting new
-    // instances
-    pm2.stop(name, () => {
+    // instances. If no instances with that name are found then we just
+    // fall back to starting normally
+    checkIfPM2ProcessExists(name, (exists) => {
+      if (exists) {
+        pm2.stop(name, () => {
+          startPM2(scriptPath, name);
+        });
+        return;
+      }
+
       startPM2(scriptPath, name);
     });
   });
@@ -80,11 +88,26 @@ function startPM2 (scriptPath, name) {
    */
   process.on("SIGINT", () => {
     logger.info(`Stopping pm2 instance: ${highlight(name)}…`);
-    pm2.delete(name, () => {
+    checkIfPM2ProcessExists(name, (exists) => {
+      if (exists) {
+        pm2.delete(name, () => {
+          pm2.disconnect(() => {
+            process.exit();
+          });
+        });
+        return;
+      }
+
       pm2.disconnect(() => {
         process.exit();
       });
     });
   });
 }
 
+function checkIfPM2ProcessExists (name, callback) {
+  pm2.list((error, result) => {
+    callback(result.map((i) => i.name === name).length > 0);
+  });
+}
+

templates/new/src/config/.Dockerfile

@@ -2,7 +2,7 @@
 # This file is automatically generated. You can copy this file and add a
 # Dockerfile to the root of the project if you would like to use a custom
 # docker setup.
-FROM truecar/gluestick:0.7.0
+FROM truecar/gluestick:0.7.2
 
 ADD . /app