Work on 1.0.0 release

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Change log
 
+### 1.0.0 (2015-10-04)
+
+Bundles:
+
+- Node.js 0.10.40
+- Tupperbuild 1.0.0
+- Quickstart 0.1.1
+- PhantomJS 1.9.8 (optional)
+- ImageMagick 8:6.7.7.10-5+deb7u3 (optional)
+
 ### 0.1.2 (2015-07-23)
 
 - Updated Node.js.

README.md

@@ -92,7 +92,7 @@ Default configuration options:
 
 ## Comparison with meteord
 
-1. meteor-tupperware produces smaller images (base of 170MB vs 220MB) than meteord.
+1. meteor-tupperware produces smaller images than meteord.
 
 1. meteor-tupperware supports configuring additional build flags (like --mobile-settings or --server). meteord is not this flexible.
 

includes/scripts/_common.sh

@@ -9,7 +9,7 @@ export IMAGE_UTILS="git wget curl ca-certificates sudo bzip2"
 # Function for checking process return codes
 check_code () {
   if [ ! "$1" -eq 0 ]; then
-    echo "! Failure. Exiting..."
+    echo "[!] Failure. Exiting..."
     exit 1
   fi
 }

includes/scripts/_install_deps.sh

@@ -1,18 +1,18 @@
 #!/bin/sh
 
-echo "> Updating system..."
+echo "[-] Updating system..."
 
-# System update
+# Lists update
 apt-get update
 check_code $?
 
-echo "> Installing build dependencies... $BUILD_DEPS"
+echo "[-] Installing build dependencies... $BUILD_DEPS"
 
 # Build deps (to be removed in cleanup.sh)
 apt-get install -y --no-install-recommends $BUILD_DEPS
 check_code $?
 
-echo "> Installing image utils... $IMAGE_UTILS"
+echo "[-] Installing image utils... $IMAGE_UTILS"
 
 # Sys utils
 apt-get install -y --no-install-recommends $IMAGE_UTILS

includes/scripts/_install_node.sh

@@ -2,7 +2,7 @@
 
 NODE_DIST=node-v${NODE_VERSION}-linux-x64
 
-echo "> Installing Node.js... $NODE_DIST"
+echo "[-] Installing Node.js... $NODE_DIST"
 
 cd /tmp
 

includes/scripts/_on_build_cleanup.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Remove apt lists
+rm -rf /var/lib/apt/lists/*
+
+# Locale cleanup
+cp -R /usr/share/locale/en\@* /tmp/ && rm -rf /usr/share/locale/* && mv /tmp/en\@* /usr/share/locale/
+
+# Clean out docs
+rm -rf /usr/share/doc /usr/share/doc-base /usr/share/man /usr/share/locale /usr/share/zoneinfo /var/cache/debconf/*-old
+
+# Clean out package management dirs
+rm -rf /var/lib/cache /var/lib/log
+
+# Clean out /tmp
+rm -rf /tmp/*
+
+# Clear npm cache
+npm cache clear

includes/scripts/_cleanup_deps.sh → includes/scripts/_post_clean.sh

@@ -1,26 +1,31 @@
 #!/bin/sh
 
-echo "> Purging build dependencies..."
-
 # Purge build deps
 apt-get purge -y $BUILD_DEPS
+apt-get remove --purge -y $BUILD_DEPS
 check_code $?
 
 # Autoremove any junk
+apt-get clean -y
+apt-get autoclean -y
 apt-get autoremove -y
 check_code $?
 
-echo "> Cleaning out docs, pkg management cruft and /tmp..."
+# Remove apt lists
+rm -rf /var/lib/apt/lists/*
+check_code $?
+
+# Locale cleanup
+cp -R /usr/share/locale/en\@* /tmp/ && rm -rf /usr/share/locale/* && mv /tmp/en\@* /usr/share/locale/
 
 # Clean out docs
-rm -rf /usr/share/doc /usr/share/doc-base /usr/share/man /usr/share/locale /usr/share/zoneinfo
+rm -rf /usr/share/doc /usr/share/doc-base /usr/share/man /usr/share/locale /usr/share/zoneinfo /var/cache/debconf/*-old
 
 # Clean out package management dirs
 rm -rf /var/lib/cache /var/lib/log
 
 # Clean out /tmp
 rm -rf /tmp/*
 
-echo "> Clearing npm cache"
 # Clear npm cache
 npm cache clear

includes/scripts/_pre_clean.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "[-] Performing image cleanup..."
+
+# Purge packages
+apt-get purge -y `apt-mark showauto`
+apt-get remove --purge -y `apt-mark showauto`
+check_code $?
+
+# Autoremove any junk
+apt-get clean -y
+apt-get autoclean -y
+apt-get autoremove -y
+check_code $?

includes/scripts/_setup_tupperbuild.sh

@@ -2,7 +2,7 @@
 
 cd $TUPPERBUILD_DIR
 
-echo "> Setting up tupperbuild..."
+echo "[-] Setting up tupperbuild..."
 
 npm install
 check_code $?

includes/scripts/bootstrap.sh

@@ -4,10 +4,12 @@ BASEDIR=`dirname $0`
 
 . $BASEDIR/_common.sh
 
+. $BASEDIR/_pre_clean.sh
+
 . $BASEDIR/_install_deps.sh
 
 . $BASEDIR/_install_node.sh
 
 . $BASEDIR/_setup_tupperbuild.sh
 
-. $BASEDIR/_cleanup_deps.sh
+. $BASEDIR/_post_clean.sh

includes/scripts/on_build.sh

@@ -7,4 +7,4 @@ BASEDIR=`dirname $0`
 node $TUPPERBUILD_DIR/main.js $1
 check_code $?
 
-rm -rf /tmp/*
+. $BASEDIR/_cleanup_deps.sh

includes/scripts/start_app.sh

@@ -5,7 +5,7 @@ BASEDIR=`dirname $0`
 . $BASEDIR/_common.sh
 
 if [ ! -f $OUTPUT_DIR/bundle/main.js ]; then
-  echo "There is no bundle. Please see usage docs here: https://github.com/chriswessels/meteor-tupperware"
+  echo "[!] There is no application bundle. Please see usage docs here: https://github.com/chriswessels/meteor-tupperware"
   exit 1
 fi
 
@@ -19,6 +19,6 @@ if [ -z "$METEOR_ENV" ]; then
   export METEOR_ENV="production"
 fi
 
-echo "> meteor-tupperware is starting your application with NODE_ENV=$NODE_ENV and METEOR_ENV=$METEOR_ENV..."
+echo "[-] meteor-tupperware is starting your application with NODE_ENV=$NODE_ENV and METEOR_ENV=$METEOR_ENV..."
 
 exec node $OUTPUT_DIR/bundle/main.js "$@"