Merge remote-tracking branch 'origin/stable' into rc/v1.3.2

Author: borsboom

doc/ghcjs.md

@@ -39,26 +39,28 @@ setup-info:
 
 Or for the latest one based on `ghc-8.0.1` (with more features):
 ```yaml
-resolver: lts-7.8
-compiler: ghcjs-0.2.1.9007008_ghc-8.0.1
+resolver: lts-7.14
+compiler: ghcjs-0.2.1.9007014_ghc-8.0.1
 compiler-check: match-exact
 
 setup-info:
   ghcjs:
     source:
-      ghcjs-0.2.1.9007008_ghc-8.0.1:
-          url: http://ghcjs.tolysz.org/ghc-8.0-2016-11-07-lts-7.8-9007008.tar.gz
-          sha1: 190300a3725cde44b2a08be9ef829f2077bf8825
+      ghcjs-0.2.1.9007014_ghc-8.0.1:
+           url: http://ghcjs.tolysz.org/ghc-8.0-2016-12-25-lts-7.14-9007014.tar.gz
+           sha1: 0d2ebe0931b29adca7cb9d9b9f77d60095bfb864
 ```
 The later can be generated via: https://github.com/tolysz/prepare-ghcjs
-the fromer is a bit more manual. Those bundles are only tested against the latest `node-6.9.1`.
+the fromer is a bit more manual. Those bundles are only tested against the latest `node-7.2.1`.
 
 In order to corrrectly boot and use ghcjs, one might need to install `alex` `happy` `hscolour` `hsc2hs` with the normal ghc.
 
 Older resolvers:
 
 |resolver|url|sha1|
 |---|---|---|
+| lts-7.13 | http://ghcjs.tolysz.org/ghc-8.0-2016-12-18-lts-7.13-9007013.tar.gz | 530c4ee5e19e2874e128431c7ad421e336df0303 |
+| lts-7.8 | http://ghcjs.tolysz.org/ghc-8.0-2016-11-07-lts-7.8-9007008.tar.gz | 190300a3725cde44b2a08be9ef829f2077bf8825 |
 | lts-7.7 | http://ghcjs.tolysz.org/ghc-8.0-2016-11-03-lts-7.7-9007007.tar.gz | ce169f85f1c49ad613ae77fc494d5565452ff59a |
 | lts-7.5 | http://ghcjs.tolysz.org/ghc-8.0-2016-10-24-lts-7.5-9007005.tar.gz | 450e81028d7f1eb82a16bc4b0809f30730c3e173 |
 | lts-7.4 | http://ghcjs.tolysz.org/ghc-8.0-2016-10-22-lts-7.4-9007004.tar.gz | ed77b3c15fedbadad5ab0e0afe1bd42c0a8695b4 |

doc/yaml_configuration.md

@@ -224,6 +224,29 @@ You can also specify `entrypoints`. By default all your executables are placed
 in `/usr/local/bin`, but you can specify a list using `executables` to only add
 some.
 
+When you specify `entrypoints`, multiple containers will be built:  a project
+container, and one container for each entrypoint.
+
+For example the following configuration:
+
+```yaml
+image:
+  containers:
+  - name: myproject
+    base: fpco/stack-run
+    add:
+      production/app-backend/conf/: /etc/app-backend
+    entrypoints:
+    - app-backend
+```
+
+will build one container tagged `myproject:latest` which contains the project 
+including the `/etc/app-backend` configuration data.
+
+Another container tagged `myproject-app-backend:latest` based on the `myproject:latest`
+will additionally contain the logic for starting the `app-backend` entrypoint.
+
+
 ### user-message
 
 A user-message is inserted by `stack init` when it omits packages or adds