Skip to content

Commit

Permalink
Removed split as it increases image size. 1.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswessels committed Oct 4, 2015
1 parent b7e1e21 commit 37ad063
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 34 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 1 addition & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
42 changes: 16 additions & 26 deletions includes/tupperbuild/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ var tupperwareJsonDefaults = {
}
};

var runMode = '',
copyPath = '/app',
var copyPath = '/app',
meteorReleaseString,
meteorVersion,
tupperwareJson = {};
Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -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
]);

0 comments on commit 37ad063

Please sign in to comment.