allow override of docker image

README.md

@@ -219,6 +219,21 @@ Meteor Up uses Docker to run and manage your app. It uses [MeteorD](https://gith
 
 For more information see [`lib/taskLists.js`](https://github.com/arunoda/meteor-up/blob/mupx/lib/taskLists/linux.js).
 
+#### Using a custom docker image
+
+The default docker image ([meteorhacks/meteord](https://hub.docker.com/r/meteorhacks/meteord/))
+can be overridden by setting `dockerImage` in the mup.json file.  This
+image should be based off of meteord to ensure compatibility. ([Here](https://github.com/gdw2/docker-meteord-buzz)
+is an example adding the `graphicsmagick` binary dependency to the docker image.)
+
+For example, add the following to `mup.json`:
+
+```
+  // Docker image to use
+  "dockerImage": "dockeruser/custommeteord:latest",
+```
+
+
 #### Multiple Deployment Targets
 
 You can use an array to deploy to multiple servers at once.

example/mup.json

@@ -37,7 +37,7 @@
   // Before mup checks that, it will wait for the number of seconds configured below.
   "deployCheckWaitTime": 15,
 
-  // show a progress bar while uploading. 
+  // show a progress bar while uploading.
   // Make it false when you deploy using a CI box.
   "enableUploadProgressBar": true
-}
+}

lib/config.js

@@ -28,6 +28,10 @@ exports.read = function(configFileName) {
       mupJson.appName = "meteor";
     }
 
+    if(typeof mupJson.dockerImage === "undefined") {
+      mupJson.dockerImage = "meteorhacks/meteord:base";
+    }
+
     if(typeof mupJson.enableUploadProgressBar === "undefined") {
       mupJson.enableUploadProgressBar = true;
     }
@@ -94,12 +98,12 @@ exports.read = function(configFileName) {
     helpers.printHelp();
     process.exit(1);
   }
-  
+
   function rewritePath(location, errorMessage) {
     if(!location) {
       return mupErrorLog(errorMessage);
     }
-    
+
     var homeLocation = process.env.HOME;
     if(/^win/.test(process.platform)) {
       homeLocation = process.env.USERPROFILE;
@@ -127,4 +131,4 @@ exports.read = function(configFileName) {
     console.error(errorMessage.red.bold);
     process.exit(1);
   }
-};
+};

lib/taskLists/linux.js

@@ -72,6 +72,7 @@ exports.deploy = function(bundlePath, env, config) {
     dest: '/opt/' + appName + '/config/start.sh',
     vars: {
       appName: appName,
+      dockerImage: config.dockerImage,
       useLocalMongo: config.setupMongo,
       port: env.PORT,
       sslConfig: config.ssl
@@ -189,4 +190,4 @@ function deployAndVerify(taskList, appName, port, deployCheckWaitTime) {
       port: port
     }
   });
-}
+}

templates/linux/start.sh

@@ -6,6 +6,7 @@ BUNDLE_PATH=$APP_PATH/current
 ENV_FILE=$APP_PATH/config/env.list
 PORT=<%= port %>
 USE_LOCAL_MONGO=<%= useLocalMongo? "1" : "0" %>
+DOCKERIMAGE=<%= dockerImage %>
 
 # Remove previous version of the app, if exists
 docker rm -f $APPNAME
@@ -15,7 +16,7 @@ docker rm -f $APPNAME-frontend
 
 # We don't need to fail the deployment because of a docker hub downtime
 set +e
-docker pull meteorhacks/meteord:base
+docker pull $DOCKERIMAGE
 set -e
 
 if [ "$USE_LOCAL_MONGO" == "1" ]; then
@@ -29,7 +30,7 @@ if [ "$USE_LOCAL_MONGO" == "1" ]; then
     --hostname="$HOSTNAME-$APPNAME" \
     --env=MONGO_URL=mongodb://mongodb:27017/$APPNAME \
     --name=$APPNAME \
-    meteorhacks/meteord:base
+    $DOCKERIMAGE
 else
   docker run \
     -d \
@@ -39,7 +40,7 @@ else
     --hostname="$HOSTNAME-$APPNAME" \
     --env-file=$ENV_FILE \
     --name=$APPNAME \
-    meteorhacks/meteord:base
+    $DOCKERIMAGE
 fi
 
 <% if(typeof sslConfig === "object")  { %>
@@ -56,4 +57,4 @@ fi
     --publish=<%= sslConfig.port %>:443 \
     --name=$APPNAME-frontend \
     meteorhacks/mup-frontend-server /start.sh
-<% } %>
+<% } %>