Merge branch '1.3.5'

Author: zodern

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.3.5 - Nov 3, 2017
+- Fix tar errors
+- The validation message shown when the `servers` object is missing from the config has been removed since some deployment plugins might not need it
+- The config created by `mup init` has the correct docker image for Meteor 1.6
+- Add table to docs that shows which docker image to use for each Meteor version
+
+**Plugins**
+- The remaining Meteor functionality has been removed from the default plugin, allowing plugins to completely take over deploying and managing the app when `app.type` in the config is set to something besides `meteor`
+
 ## 1.3.4 - October 4, 2017
 - The exit code for `mup validate` is now 1 when there are validation errors
 - Fix changing proxy's clientUploadLimit with `proxy.shared.clientUploadLimit`

README.md

@@ -8,7 +8,7 @@ You can install and use Meteor Up on Linux, Mac and Windows. It can deploy to se
 
 This version of Meteor Up is powered by [Docker](http://www.docker.com/), making deployment easy to manage and reducing server specific errors.
 
-Read the [getting started tutorial](http://meteor-up.com/getting-started.html).  
+Read the [getting started tutorial](http://meteor-up.com/getting-started.html).
 
 ### Features
 

docs/docs.md

@@ -252,6 +252,16 @@ The `--cached-build` option will use the build from the last time you deployed t
 * `mup restart` - restart the app
 * `mup logs [-f --tail=50]` - view the app's logs. Supports all of the flags from `docker logs`.
 
+## Meteor Support
+
+Mup supports Meteor 1.2 and newer, though you might need to change the docker image in your mup config.
+
+| Meteor version | Docker image | Notes |
+| --- | --- | --- |
+| 1.2 - 1.3 | `kadirahq/meteord` | This is the default docker image. When using Meteor 1.2, `app.buildOptions.serverOnly` should be false. |
+| 1.4 - 1.5 | `abernix/meteord:base` |  |
+| 1.6 | `abernix/meteord:node-8.4.0-base` | |
+
 ## Build Options
 
 You can define Meteor build options in `mup.js` like this: