From 37ad063c10f3ce561097940e1129b5552424de59 Mon Sep 17 00:00:00 2001
From: Chris Wessels <undefined.za@gmail.com>
Date: Sun, 4 Oct 2015 19:21:44 +0100
Subject: [PATCH] Removed split as it increases image size. 1.0.0 release

---
 CHANGELOG.md                 |  1 -
 Dockerfile                   |  8 +------
 includes/tupperbuild/main.js | 42 ++++++++++++++----------------------
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d00c165..fb146f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,6 @@
 
 - Improved image cleanup tactics. Images should be slightly smaller.
 - Improved the way tupperbuild executes commands. If an error occurs, it will report the `stderr` and `stdout`.
-- Improved order of onbuild triggers to utilise intermediary layer caching (thanks @ijpiantanida).
 - Added ability to specify pre and post `meteor build` commands to be run. See README.
 
 Bundles:
diff --git a/Dockerfile b/Dockerfile
index c4bcab8..baea687 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,12 +11,6 @@ EXPOSE        80
 
 ENTRYPOINT    sh /tupperware/scripts/start_app.sh
 
-ONBUILD COPY  ./.meteor/release  /app/.meteor/release
-
-ONBUILD COPY  ./*.json  /app/
-
-ONBUILD RUN   sh /tupperware/scripts/on_build.sh install
-
 ONBUILD COPY  ./ /app
 
-ONBUILD RUN   sh /tupperware/scripts/on_build.sh build
+ONBUILD RUN   sh /tupperware/scripts/on_build.sh
diff --git a/includes/tupperbuild/main.js b/includes/tupperbuild/main.js
index f032995..3f18d1a 100644
--- a/includes/tupperbuild/main.js
+++ b/includes/tupperbuild/main.js
@@ -19,8 +19,7 @@ var tupperwareJsonDefaults = {
   }
 };
 
-var runMode = '',
-    copyPath = '/app',
+var copyPath = '/app',
     meteorReleaseString,
     meteorVersion,
     tupperwareJson = {};
@@ -79,7 +78,7 @@ function printBanner (done) {
     ].join("\n")
   );
   log.info("github.com/chriswessels/meteor-tupperware (tupperbuild v" + pkgjson.version + ")\n");
-  log.info("Running in " + runMode + " mode.");
+
   done();
 }
 
@@ -379,26 +378,17 @@ function printDone (done) {
 
 // Kick things off
 
-runMode = process.argv[2];
-
-if (runMode === "install") {
-  async.series([
-    printBanner,
-    checkCopyPath,
-    extractTupperwareJson,
-    installAppDeps,
-    downloadMeteorInstaller,
-    installMeteor
-  ]);
-} else if (runMode === "build") {
-  async.series([
-    printBanner,
-    extractTupperwareJson,
-    runPreBuildCommands,
-    buildApp,
-    npmInstall,
-    runPostBuildCommands,
-    runCleanup,
-    printDone
-  ]);
-}
+async.series([
+  printBanner,
+  checkCopyPath,
+  extractTupperwareJson,
+  installAppDeps,
+  downloadMeteorInstaller,
+  installMeteor,
+  runPreBuildCommands,
+  buildApp,
+  npmInstall,
+  runPostBuildCommands,
+  runCleanup,
+  printDone
+]);