Merge pull request #462 from dmetzler/master

sudo and git are needed to build ffmepg

nuxeo/content.md

@@ -99,6 +99,14 @@ If set to "true", this will enable the [automation trace mode](https://doc.nuxeo
 
 If set to "true", this will enable the development mode that will allow [hot reload](https://doc.nuxeo.com/display/CORG/Supporting+Hot+Reload) when developing with [Nuxeo Studio](http://www.nuxeo.com/products/studio/).
 
+### `NUXEO_BINARY_STORE`
+
+Tells the location of the binary store which configure the [binary storage](https://doc.nuxeo.com/x/fYYZAQ)
+
+### `NUXEO_TRANSIENT_STORE`
+
+Tells the location of [the transient storage](http://doc.nuxeo.com/display/NXDOC/Transient+Store)
+
 # How to extend this image
 
 ## Adding additional configuration
@@ -110,6 +118,10 @@ FROM nuxeo:7.10
 ADD nuxeo.conf /nuxeo.conf
 ```
 
+## Launching custom shell scripts
+
+You can add your own shell scripts in a special `/docker-entrypoint-initnuxeo.d` directory. When ending in `.sh`, they will be run on default entrypoint startup.
+
 ## ffmpeg
 
 As it contains some non-free Codecs, we dont't ship a binary version of `ffmpeg` as part of this image. However, you can simply add the compilation in a derived images by adding these lines to your Dockerfile
@@ -118,7 +130,7 @@ As it contains some non-free Codecs, we dont't ship a binary version of `ffmpeg`
 FROM nuxeo:7.10
 
 RUN echo "deb http://httpredir.debian.org/debian jessie non-free" >> /etc/apt/sources.list
-RUN apt-get update && apt-get install -y --no-install-recommends libfaac-dev
+RUN apt-get update && apt-get install -y --no-install-recommends libfaac-dev git
 
 WORKDIR /tmp
 # Build ffmpeg